From c0d2f924590918b0176aaf1f84ccf372ce4f13c4 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 25 Dec 2018 20:35:43 +0100
Subject: [PATCH 01/53] cmake: use multiple outputs for GNUInstallDirs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CMake contains a module for more granular installation directories:

https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html

Let’s set the paths so that projects using the module can be more
easily split into multiple outputs.
---
 .../tools/build-managers/cmake/setup-hook.sh       | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index f095103ee04..0df64bc34c8 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -68,8 +68,20 @@ cmakeConfigurePhase() {
     # executable. This flag makes the shared library accessible from its
     # nix/store directory.
     cmakeFlags="-DCMAKE_INSTALL_NAME_DIR=${!outputLib}/lib $cmakeFlags"
+
+    # This ensures correct paths with multiple output derivations
+    # It requires the project to use variables from GNUInstallDirs module
+    # https://cmake.org/cmake/help/latest/module/GNUInstallDirs.html
+    cmakeFlags="-DCMAKE_INSTALL_BINDIR=${!outputBin}/bin $cmakeFlags"
+    cmakeFlags="-DCMAKE_INSTALL_SBINDIR=${!outputBin}/sbin $cmakeFlags"
+    cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputInclude}/include $cmakeFlags"
+    cmakeFlags="-DCMAKE_INSTALL_OLDINCLUDEDIR=${!outputInclude}/include $cmakeFlags"
+    cmakeFlags="-DCMAKE_INSTALL_MANDIR=${!outputMan}/share/man $cmakeFlags"
+    cmakeFlags="-DCMAKE_INSTALL_INFODIR=${!outputInfo}/share/info $cmakeFlags"
+    cmakeFlags="-DCMAKE_INSTALL_DOCDIR=${!outputDoc}/share/doc/${shareDocName} $cmakeFlags"
     cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags"
-    cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags"
+    cmakeFlags="-DCMAKE_INSTALL_LIBEXECDIR=${!outputLib}/libexec $cmakeFlags"
+    cmakeFlags="-DCMAKE_INSTALL_LOCALEDIR=${!outputLib}/share/locale $cmakeFlags"
 
     # Avoid cmake resetting the rpath of binaries, on make install
     # And build always Release, to ensure optimisation flags

From f1070eec27e889566d441d90d54dc3619ce6c91e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Mon, 8 Jul 2019 21:56:40 +0200
Subject: [PATCH 02/53] stdenv: MACOSX_DEPLOYMENT_TARGET 10.10 -> 10.12

---
 pkgs/stdenv/darwin/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index f7a40bb0d0e..b6a488ed2f2 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -32,7 +32,7 @@ in rec {
     export NIX_ENFORCE_NO_NATIVE="''${NIX_ENFORCE_NO_NATIVE-1}"
     export NIX_IGNORE_LD_THROUGH_GCC=1
     stripAllFlags=" " # the Darwin "strip" command doesn't know "-s"
-    export MACOSX_DEPLOYMENT_TARGET=10.10
+    export MACOSX_DEPLOYMENT_TARGET=10.12
     export SDKROOT=
     export CMAKE_OSX_ARCHITECTURES=x86_64
     # Workaround for https://openradar.appspot.com/22671534 on 10.11.

From 2a72715e09d38359e8b07e9c228aa926eb526a50 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 1 Jul 2019 18:01:27 -0500
Subject: [PATCH 03/53] freetype: 2.10.0 -> 2.10.1

https://sourceforge.net/projects/freetype/files/freetype2/2.10.1/
---
 pkgs/development/libraries/freetype/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 4658ac049df..ba49f5841f1 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -14,7 +14,7 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "freetype";
-  version = "2.10.0";
+  version = "2.10.1";
 
   meta = with stdenv.lib; {
     description = "A font rendering engine";
@@ -32,20 +32,20 @@ in stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "01mybx78n3n9dhzylbrdy42wxdwfn8rp514qdkzjy6b5ij965k7w";
+    url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz";
+    sha256 = "0vx2dg1jh5kq34dd6ifpjywkpapp8a7p1bvyq9yq5zi1i94gmnqn";
   };
 
   propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
+
   # dependence on harfbuzz is looser than the reverse dependence
   nativeBuildInputs = [ pkgconfig which makeWrapper ]
     # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
     ++ optional (!stdenv.isLinux) gnumake;
 
   patches =
-    [ ./enable-table-validation.patch
-    ] ++
-    optional useEncumberedCode ./enable-subpixel-rendering.patch;
+    [ ./enable-table-validation.patch ] ++
+  optional useEncumberedCode ./enable-subpixel-rendering.patch;
 
   outputs = [ "out" "dev" ];
 

From f3381b53e1b3ceb96edc32296dd0271e7997639b Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 9 Jul 2019 13:23:08 -0500
Subject: [PATCH 04/53] freetype: undo formatting, esp since doesn't move to
 convention.

Sorry, thanks for catching this in review!

Leaving it as it was to keep this change simpler and
friendlier to blame and such :).
---
 pkgs/development/libraries/freetype/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index ba49f5841f1..eb26a241d1c 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -44,8 +44,9 @@ in stdenv.mkDerivation rec {
     ++ optional (!stdenv.isLinux) gnumake;
 
   patches =
-    [ ./enable-table-validation.patch ] ++
-  optional useEncumberedCode ./enable-subpixel-rendering.patch;
+    [ ./enable-table-validation.patch
+    ] ++
+    optional useEncumberedCode ./enable-subpixel-rendering.patch;
 
   outputs = [ "out" "dev" ];
 

From 9aecdf07c78c6249a3f43d6cdbb674c2b044cd9b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2019 18:34:07 -0700
Subject: [PATCH 05/53] openresolv: 3.9.0 -> 3.9.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openresolv/versions
---
 pkgs/tools/networking/openresolv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openresolv/default.nix b/pkgs/tools/networking/openresolv/default.nix
index 209e1f64c72..302e08617af 100644
--- a/pkgs/tools/networking/openresolv/default.nix
+++ b/pkgs/tools/networking/openresolv/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "openresolv-${version}";
-  version = "3.9.0";
+  version = "3.9.1";
 
   src = fetchurl {
     url = "mirror://roy/openresolv/${name}.tar.xz";
-    sha256 = "1f2dccc52iykbpma26fbxzga2l6g4njm3bgaxz4rgdrb4cwlv82i";
+    sha256 = "1wlzi88837rf4ygswmzpbcmgkbbjhn5n322n9q6ir6x367hygf1q";
   };
 
   buildInputs = [ makeWrapper ];

From 214d73a46b12af38d87caec894e595e6eb83013b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2019 15:43:55 -0700
Subject: [PATCH 06/53] mpg123: 1.25.10 -> 1.25.11

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mpg123/versions
---
 pkgs/applications/audio/mpg123/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 44f1c681ec1..b201bd65cae 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mpg123-1.25.10";
+  name = "mpg123-1.25.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/mpg123/${name}.tar.bz2";
-    sha256 = "08vhp8lz7d9ybhxcmkq3adwfryhivfvp0745k4r9kgz4wap3f4vc";
+    sha256 = "1cpal2zsm3zgi6f48vvwpg6wgkv42ndi7lk3zsg7sz52z83k61nz";
   };
 
   buildInputs = stdenv.lib.optional (!stdenv.isDarwin) alsaLib;

From f10553883d5bdb964a497680b77ac73d42cebddc Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Jul 2019 15:44:41 -0400
Subject: [PATCH 07/53] pythonPackages.pycurl: 7.43.0.2 -> 7.43.0.3

---
 .../python-modules/pycurl/default.nix         | 31 ++++++++++++-------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pycurl/default.nix b/pkgs/development/python-modules/pycurl/default.nix
index 9fb27c88c02..93ea1e6734b 100644
--- a/pkgs/development/python-modules/pycurl/default.nix
+++ b/pkgs/development/python-modules/pycurl/default.nix
@@ -11,27 +11,34 @@
 
 buildPythonPackage rec {
   pname = "pycurl";
-  version = "7.43.0.2";
+  version = "7.43.0.3";
   disabled = isPyPy; # https://github.com/pycurl/pycurl/issues/208
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0f0cdfc7a92d4f2a5c44226162434e34f7d6967d3af416a6f1448649c09a25a4";
+    sha256 = "13nsvqhvnmnvfk75s8iynqsgszyv06cjp4drd3psi7zpbh63623g";
   };
 
-  buildInputs = [ curl openssl.out ];
-  nativeBuildInputs = [ curl ];
+  buildInputs = [
+    curl
+    openssl.out
+  ];
 
-  checkInputs = [ bottle pytest nose flaky ];
+  nativeBuildInputs = [
+    curl
+  ];
+
+  checkInputs = [
+    bottle
+    pytest
+    nose
+    flaky
+  ];
 
   checkPhase = ''
-    py.test -k "not ssh_key_cb_test \
-                and not test_libcurl_ssl_gnutls \
-                and not test_libcurl_ssl_nss \
-                and not test_libcurl_ssl_openssl \
-                and not test_libcurl_ssl_unrecognized \
-                and not test_request_with_verifypeer \
-                and not test_ssl_in_static_libs" tests
+    pytest tests -k "not test_ssl_in_static_libs \
+                     and not test_keyfunction \
+                     and not test_keyfunction_bogus_return"
   '';
 
   preConfigure = ''

From ba4384d8650de330fd218f08e8679e1d486bd1dc Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Jul 2019 16:30:08 -0400
Subject: [PATCH 08/53] pythonPackages.jsonschema: 2.6.0 -> 3.0.1

---
 .../python-modules/jsonschema/default.nix     | 48 +++++++++++++------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix
index db6be9f9918..dfff4ac4265 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/pkgs/development/python-modules/jsonschema/default.nix
@@ -1,31 +1,51 @@
-{ stdenv, buildPythonPackage, fetchPypi, python
-, nose, mock, vcversioner, functools32 }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, attrs
+, pyrsistent
+, setuptools
+, six
+, functools32
+, setuptools_scm
+, perf
+, twisted
+, python
+}:
 
 buildPythonPackage rec {
   pname = "jsonschema";
-  version = "2.6.0";
+  version = "3.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
+    sha256 = "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc";
   };
 
-  checkInputs = [ nose mock vcversioner ];
-  propagatedBuildInputs = [ functools32 ];
+  nativeBuildInputs = [
+    setuptools_scm
+  ];
 
-  postPatch = ''
-    substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py \
-      --replace "python" "${python.pythonForBuild.interpreter}"
-  '';
+  propagatedBuildInputs = [
+    attrs
+    pyrsistent
+    setuptools
+    six
+    functools32
+  ];
+
+  checkInputs = [
+    twisted
+    perf
+  ];
 
   checkPhase = ''
-    nosetests
+    ${python.interpreter} setup.py test --test-suite=jsonschema.tests
   '';
 
-  meta = with stdenv.lib; {
-    homepage = https://github.com/Julian/jsonschema;
+  meta = with lib; {
     description = "An implementation of JSON Schema validation for Python";
+    homepage = https://github.com/Julian/jsonschema;
     license = licenses.mit;
-    maintainers = with maintainers; [ domenkozar ];
+    maintainers = with maintainers; [ costrouc domenkozar ];
   };
 }

From e5f77fb6ba63b2d362b563b80c17db8921f4447e Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Jul 2019 16:36:04 -0400
Subject: [PATCH 09/53] pythonPackages.glob2: init at 0.7

needed for poetry python 2.7 support
---
 .../python-modules/glob2/default.nix          | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/glob2/default.nix

diff --git a/pkgs/development/python-modules/glob2/default.nix b/pkgs/development/python-modules/glob2/default.nix
new file mode 100644
index 00000000000..bce69bffff2
--- /dev/null
+++ b/pkgs/development/python-modules/glob2/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, python
+}:
+
+buildPythonPackage rec {
+  pname = "glob2";
+  version = "0.7";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "135bj8gm6vn45vv0phrvhyir36kfm17y7kmasxinv8lagk8dphw5";
+  };
+
+  checkPhase = ''
+    ${python.interpreter} test.py
+  '';
+
+  meta = with lib; {
+    description = "Version of the glob module that can capture patterns and supports recursive wildcards";
+    homepage = https://github.com/miracle2k/python-glob2/;
+    license = licenses.bsd3;
+    maintainers = [ maintainers.costrouc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6e20f12f957..bdc8496e2d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -586,6 +586,8 @@ in {
 
   glymur = callPackage ../development/python-modules/glymur { };
 
+  glob2 = callPackage ../development/python-modules/glob2 { };
+
   glom = callPackage ../development/python-modules/glom { };
 
   goocalendar = callPackage ../development/python-modules/goocalendar { };

From 49c265b8fefdefa30c4949cad18d89be39319910 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Jul 2019 17:20:55 -0400
Subject: [PATCH 10/53] pythonPackages.nbval: 0.9.1 -> 0.9.2 fix broken build

---
 .../python-modules/nbval/default.nix          | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/nbval/default.nix b/pkgs/development/python-modules/nbval/default.nix
index c9ab72894ef..d4f9bea11b5 100644
--- a/pkgs/development/python-modules/nbval/default.nix
+++ b/pkgs/development/python-modules/nbval/default.nix
@@ -15,21 +15,31 @@
 
 buildPythonPackage rec {
   pname = "nbval";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3f18b87af4e94ccd073263dd58cd3eebabe9f5e4d6ab535b39d3af64811c7eda";
+    sha256 = "0g8xl4158ngyhiynrkk72jpawnk4isznbijz0w085g269fps0vp2";
   };
 
-  LC_ALL = "en_US.UTF-8";
+  checkInputs = [
+    pytest
+    matplotlib
+    sympy
+    pytestcov
+  ];
 
-  buildInputs = [ glibcLocales ];
-  checkInputs = [ matplotlib sympy pytestcov ];
-  propagatedBuildInputs = [ coverage ipykernel jupyter_client nbformat pytest six ];
+  propagatedBuildInputs = [
+    coverage
+    ipykernel
+    jupyter_client
+    nbformat
+    pytest
+    six
+  ];
 
   checkPhase = ''
-    pytest tests --current-env --ignore tests/test_timeouts.py
+    pytest tests --ignore tests/test_timeouts.py
   '';
 
   meta = with lib; {

From 1ad86f9569663e111b819d8eaba0f633d8a561b5 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Jul 2019 17:29:24 -0400
Subject: [PATCH 11/53] pythonPackages.readme: refactor fix broken build

---
 .../python-modules/readme/default.nix         | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/readme/default.nix b/pkgs/development/python-modules/readme/default.nix
index 90522c34196..057283babe7 100644
--- a/pkgs/development/python-modules/readme/default.nix
+++ b/pkgs/development/python-modules/readme/default.nix
@@ -2,11 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pytest
-, six
-, docutils
-, pygments
-, bleach
-, html5lib
+, readme_renderer
 }:
 
 buildPythonPackage rec {
@@ -18,20 +14,27 @@ buildPythonPackage rec {
     sha256 = "32fbe1538a437da160fa4e4477270bfdcd8876e2e364d0d12898302644496231";
   };
 
-  buildInputs = [ pytest ];
-  propagatedBuildInputs = [ six docutils pygments bleach html5lib ];
+  checkInputs = [
+    pytest
+  ];
+
+  propagatedBuildInputs = [
+    readme_renderer
+  ];
 
   checkPhase = ''
-    py.test
+    pytest
   '';
 
-  # Tests fail, possibly broken.
+  # tests are not included with pypi release
+  # package is not readme_renderer
   doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Readme is a library for rendering readme descriptions for Warehouse";
     homepage = "https://github.com/pypa/readme";
     license = licenses.asl20;
+    maintainers = [ maintainers.costrouc ];
   };
 
 }

From d3915617681e9d1674992cb28dd9c4beaaf34398 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Jul 2019 17:32:50 -0400
Subject: [PATCH 12/53] pythonPackages.pytest-annotate: refactor fix broken
 build relax constraint

---
 .../python-modules/pytest-annotate/default.nix       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix
index 581de7beeeb..86f344b0e94 100644
--- a/pkgs/development/python-modules/pytest-annotate/default.nix
+++ b/pkgs/development/python-modules/pytest-annotate/default.nix
@@ -14,9 +14,17 @@ buildPythonPackage rec {
     sha256 = "03e4dece2d1aa91666034f1b2e8bb7a7b8c6be11baf3cf2929b26eea5c6e86f3";
   };
 
-  propagatedBuildInputs = [ pyannotate pytest ];
+  propagatedBuildInputs = [
+    pyannotate
+    pytest
+  ];
 
-  # not testing for a testing module...
+  postConfigure = ''
+    substituteInPlace setup.py \
+      --replace "pytest>=3.2.0,<4.0.0" "pytest"
+  '';
+
+  # no testing in a testing module...
   doCheck = false;
 
   meta = with stdenv.lib; {

From 248fd7a46c57773cc4f5090183d45a2be3be2878 Mon Sep 17 00:00:00 2001
From: Chris Ostrouchov <chris.ostrouchov@gmail.com>
Date: Tue, 16 Jul 2019 17:39:20 -0400
Subject: [PATCH 13/53] pythonPackages.pytest-mock: refactor fix broken package

---
 .../pytest-annotate/default.nix               |  9 +++++---
 .../python-modules/pytest-mock/default.nix    | 23 ++++++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-annotate/default.nix b/pkgs/development/python-modules/pytest-annotate/default.nix
index 86f344b0e94..12a7baa55bf 100644
--- a/pkgs/development/python-modules/pytest-annotate/default.nix
+++ b/pkgs/development/python-modules/pytest-annotate/default.nix
@@ -14,12 +14,15 @@ buildPythonPackage rec {
     sha256 = "03e4dece2d1aa91666034f1b2e8bb7a7b8c6be11baf3cf2929b26eea5c6e86f3";
   };
 
-  propagatedBuildInputs = [
-    pyannotate
+  buildInputs = [
     pytest
   ];
 
-  postConfigure = ''
+  propagatedBuildInputs = [
+    pyannotate
+  ];
+
+  postPatch = ''
     substituteInPlace setup.py \
       --replace "pytest>=3.2.0,<4.0.0" "pytest"
   '';
diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix
index 8fba5e90ab1..58e032df4df 100644
--- a/pkgs/development/python-modules/pytest-mock/default.nix
+++ b/pkgs/development/python-modules/pytest-mock/default.nix
@@ -1,4 +1,12 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch, isPy3k, pytest, mock, setuptools_scm }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, fetchpatch
+, isPy3k
+, pytest
+, mock
+, setuptools_scm
+}:
 
 buildPythonPackage rec {
   pname = "pytest-mock";
@@ -10,7 +18,14 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = lib.optional (!isPy3k) mock;
-  nativeBuildInputs = [ setuptools_scm pytest ];
+
+  nativeBuildInputs = [
+   setuptools_scm
+  ];
+
+  checkInputs = [
+    pytest
+  ];
 
   patches = [
     # Fix tests for pytest 4.6. Remove with the next release
@@ -21,7 +36,9 @@ buildPythonPackage rec {
   ];
 
   checkPhase = ''
-    py.test
+    # remove disabled test on next release
+    # https://github.com/pytest-dev/pytest-mock/pull/151
+    pytest -k "not test_detailed_introspection"
   '';
 
   meta = with lib; {

From e64663cfbe90907482fe1e064ad5d8eb64831095 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2019 07:47:00 -0700
Subject: [PATCH 14/53] harfbuzz: 2.5.1 -> 2.5.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/harfbuzz/versions
---
 pkgs/development/libraries/harfbuzz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix
index a405633c1b8..26a3428f679 100644
--- a/pkgs/development/libraries/harfbuzz/default.nix
+++ b/pkgs/development/libraries/harfbuzz/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  version = "2.5.1";
+  version = "2.5.3";
   inherit (stdenv.lib) optional optionals optionalString;
 in
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz";
-    sha256 = "17kiyq23g7bnjvyn2yg4gyr7i7qjam65n20whsrplpxxk9bk8j3d";
+    sha256 = "0p45xk5bblsw8lfs7y7z80b4rvda9f2hlpr28flkrfmpjz3hvl7y";
   };
 
   postPatch = ''

From b42edbcfa774ecebc292ea76606731a093b9ebb7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2019 03:16:04 -0700
Subject: [PATCH 15/53] e2fsprogs: 1.45.2 -> 1.45.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/e2fsprogs/versions
---
 pkgs/tools/filesystems/e2fsprogs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/e2fsprogs/default.nix b/pkgs/tools/filesystems/e2fsprogs/default.nix
index babb3d844fe..d8ddde24ade 100644
--- a/pkgs/tools/filesystems/e2fsprogs/default.nix
+++ b/pkgs/tools/filesystems/e2fsprogs/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "e2fsprogs";
-  version = "1.45.2";
+  version = "1.45.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1bhqljgcngys1diaxh7rnxc85d1jsril8xd7bach9imdjwr1wlm8";
+    sha256 = "0gcqfnp9h7wgz1vq402kxd2w398vqaim26aq9i722v3lrgh5cm9s";
   };
 
   outputs = [ "bin" "dev" "out" "man" "info" ];

From 69b233e7047504d8708e7f40445874bf7245dc0b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2019 00:39:51 -0700
Subject: [PATCH 16/53] curl: 7.65.0 -> 7.65.3

---
 pkgs/tools/networking/curl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index bd502ee34c6..652bcdba874 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -24,14 +24,14 @@ assert brotliSupport -> brotli != null;
 assert gssSupport -> libkrb5 != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.65.0";
+  name = "curl-7.65.3";
 
   src = fetchurl {
     urls = [
       "https://curl.haxx.se/download/${name}.tar.bz2"
       "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] name}/${name}.tar.bz2"
     ];
-    sha256 = "0p6z77iv6wlxq7skbnxn61rn8rangrp4g4spr09y920fcf7w0iza";
+    sha256 = "02g5zj4rq5sr15jzjqk70xk4k92i2pdmpq00xb4pnba8ps1mx18a";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];

From 2b974b576c6ed8b32316f803e82635203b2177ba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 18 Jun 2019 09:32:21 -0700
Subject: [PATCH 17/53] vim: 8.1.1432 -> 8.1.1547

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/vim/versions
---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 2e4d494a0db..63d8add3a01 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,12 +1,12 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "8.1.1432";
+  version = "8.1.1547";
 
   src = fetchFromGitHub {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    sha256 = "0f8isi84dcmsfvvjzayys57zf4j56wngnpn9hfj0jn1z7x3vdbww";
+    sha256 = "01v35wq8wjrbzmdf5r02gp0sfa9yyfswsi3fqzn94cd68qhskkpr";
   };
 
   enableParallelBuilding = true;

From 863f821bdf1a7c86e575855f603c41f41b7873ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Tue, 13 Nov 2018 03:33:23 +0100
Subject: [PATCH 18/53] pyopenssl: Disable flaky test_wantWriteError test.

See added comment for details.
---
 pkgs/development/python-modules/pyopenssl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index 713861deae3..ec17b77ba20 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -46,6 +46,8 @@ let
     # These tests, we disable always.
     "test_set_default_verify_paths"
     "test_fallback_default_verify_paths"
+    # https://github.com/pyca/pyopenssl/issues/768
+    "test_wantWriteError"
   ] ++ (
     optionals (hasPrefix "libressl" openssl.meta.name) failingLibresslTests
   ) ++ (

From 2c5763538ab481f95cd40bce13b526958a87394d Mon Sep 17 00:00:00 2001
From: Andreas Rammhold <andreas@rammhold.de>
Date: Sat, 20 Jul 2019 23:53:56 +0200
Subject: [PATCH 19/53] libarchive: 3.3.3 -> 3.4.0

Release notes: https://github.com/libarchive/libarchive/releases/tag/v3.4.0
---
 .../libraries/libarchive/default.nix          | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index f2a1c500a8b..3cf8a6da736 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -1,5 +1,5 @@
 {
-  fetchurl, fetchpatch, stdenv, pkgconfig,
+  fetchFromGitHub, stdenv, pkgconfig, autoreconfHook,
   acl, attr, bzip2, e2fsprogs, libxml2, lzo, openssl, sharutils, xz, zlib,
 
   # Optional but increases closure only negligibly.
@@ -10,31 +10,18 @@ assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
   name = "libarchive-${version}";
-  version = "3.3.3";
+  version = "3.4.0";
 
-  src = fetchurl {
-    url = "${meta.homepage}/downloads/${name}.tar.gz";
-    sha256 = "0bhfncid058p7n1n8v29l6wxm3mhdqfassscihbsxfwz3iwb2zms";
+  src = fetchFromGitHub {
+    owner = "libarchive";
+    repo = "libarchive";
+    rev = "v${version}";
+    sha256 = "063f5bw9qmksj3iy6094qxwawx174cx00q1fg6l698wqw7xn8ihq";
   };
 
-  patches = [
-    (fetchpatch {
-      # details: https://github.com/libarchive/libarchive/pull/1105
-      name = "cve-2018-1000877.diff"; # CVE-2018-1000877..80
-      url = "https://github.com/libarchive/libarchive/pull/1105.diff";
-      sha256 = "0mxcawfdy9m40mykzwhkl39a6vnh4ypgy0ipcz74qm4bi72x0gyf";
-    })
-    (fetchpatch {
-      # details: https://github.com/libarchive/libarchive/pull/1120
-      name = "cve-2019-1000019_cve-2019-1000020.diff";
-      url = "https://github.com/libarchive/libarchive/pull/1120.diff";
-      sha256 = "1mgx92v8hm7hw9j34nbfriqfkxshh3cy25rhavr7kl7lz4x5a6g4";
-    })
-  ];
-
   outputs = [ "out" "lib" "dev" ];
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [ sharutils zlib bzip2 openssl xz lzo ]
     ++ stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ]
     ++ stdenv.lib.optional xarSupport libxml2;

From d5ce2a186c168ccce155b2e48d151d23c50a6e9c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sun, 21 Jul 2019 00:11:44 +0000
Subject: [PATCH 20/53] zstd: 1.4.0 -> 1.4.1

---
 pkgs/tools/compression/zstd/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index ff2589031b6..257396e0428 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -4,11 +4,11 @@
 , legacySupport ? false }:
 
 stdenv.mkDerivation rec {
-  name = "zstd-${version}";
-  version = "1.4.0";
+  pname = "zstd";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
-    sha256 = "1gfxi3ymgavjfxh84rhfjan7l4pymwfrn051nwc7n0s3mxp09m6v";
+    sha256 = "1f2nvhsx1fsd6zbnwvc6bbrm9ghkcvamqqg79fxgk5284rc6nynv";
     rev = "v${version}";
     repo = "zstd";
     owner = "facebook";
@@ -40,6 +40,8 @@ stdenv.mkDerivation rec {
       --replace "zstdcat" "$out/bin/zstdcat"
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Zstandard real-time compression algorithm";
     longDescription = ''
@@ -52,8 +54,7 @@ stdenv.mkDerivation rec {
       property shared by most LZ compression algorithms, such as zlib.
     '';
     homepage = https://facebook.github.io/zstd/;
-    # The licence of the CLI programme is GPLv2+, that of the library BSD-2.
-    license = with licenses; [ gpl2Plus bsd2 ];
+    license = with licenses; [ bsd3 ]; # Or, at your opinion, GPL-2.0-only.
 
     platforms = platforms.unix;
     maintainers = with maintainers; [ orivej ];

From 16ad5d54017c8da5dc29ae3b4e04ce4a6bd038c5 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 20 Jul 2019 04:28:00 +0200
Subject: [PATCH 21/53] pythonPackages.bcrypt: 3.1.6 -> 3.1.7

---
 pkgs/development/python-modules/bcrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix
index 28cd08fb0fc..c32fefbbdfe 100644
--- a/pkgs/development/python-modules/bcrypt/default.nix
+++ b/pkgs/development/python-modules/bcrypt/default.nix
@@ -4,12 +4,12 @@
 with stdenv.lib;
 
 buildPythonPackage rec {
-  version = "3.1.6";
+  version = "3.1.7";
   pname = "bcrypt";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "44636759d222baa62806bbceb20e96f75a015a6381690d1bc2eda91c01ec02ea";
+    sha256 = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42";
   };
   buildInputs = [ pycparser mock pytest py ];
   propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi;

From d886bc27ed03e27e694cddbce01bbac56fe9e702 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 20 Jul 2019 04:28:29 +0200
Subject: [PATCH 22/53] pythonPackages.certifi: 2019.3.9 -> 2019.6.16

---
 pkgs/development/python-modules/certifi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index 07dc701f3b1..935c0d60061 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2019.3.9";
+  version = "2019.6.16";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bnpw7hrf9i1l9gfxjnzi45hkrvzz0pyn9ia8m4mw7sxhgb08qdj";
+    sha256 = "945e3ba63a0b9f577b1395204e13c3a231f9bc0223888be653286534e5873695";
   };
 
   meta = {

From abc9221996c8b619ddd8e9304431e6e549c1dbf6 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 20 Jul 2019 04:28:59 +0200
Subject: [PATCH 23/53] pythonPackages.requests: 2.21.0 -> 2.22.0

---
 pkgs/development/python-modules/requests/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix
index 063c6d95071..260c0329576 100644
--- a/pkgs/development/python-modules/requests/default.nix
+++ b/pkgs/development/python-modules/requests/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "requests";
-  version = "2.21.0";
+  version = "2.22.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "502a824f31acdacb3a35b6690b5fbf0bc41d63a24a45c4004352b0242707598e";
+    sha256 = "11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4";
   };
 
   nativeBuildInputs = [ pytest ];

From de6fc7fb97caef3934aabaab4b1dc933afd39700 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Sat, 20 Jul 2019 04:29:25 +0200
Subject: [PATCH 24/53] pythonPackages.pyyaml: 5.1 -> 5.1.1

---
 pkgs/development/python-modules/pyyaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix
index 84dfb549fe1..9663d9ab04b 100644
--- a/pkgs/development/python-modules/pyyaml/default.nix
+++ b/pkgs/development/python-modules/pyyaml/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "PyYAML";
-  version = "5.1";
+  version = "5.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "436bc774ecf7c103814098159fbb84c2715d25980175292c648f2da143909f95";
+    sha256 = "b4bb4d3f5e232425e25dda21c070ce05168a786ac9eda43768ab7f3ac2770955";
   };
 
   # force regeneration using Cython

From c2bcf46a8ab4df671ba714a0d30f3b0182ad595a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 10:52:02 +0200
Subject: [PATCH 25/53] python3.pkgs.ipython: 7.5.0 -> 7.6.1

---
 pkgs/development/python-modules/ipython/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix
index f94b690b7f7..14b083ab500 100644
--- a/pkgs/development/python-modules/ipython/default.nix
+++ b/pkgs/development/python-modules/ipython/default.nix
@@ -22,25 +22,18 @@
 
 buildPythonPackage rec {
   pname = "ipython";
-  version = "7.5.0";
+  version = "7.6.1";
   disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e840810029224b56cd0d9e7719dc3b39cf84d577f8ac686547c8ba7a06eeab26";
+    sha256 = "11067ab11d98b1e6c7f0993506f7a5f8a91af420f7e82be6575fcb7a6ca372a0";
   };
 
   prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace setup.py --replace "'gnureadline'" " "
   '';
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/ipython/ipython/commit/e1b53e9ef91a43b9e275bb9e48b4253218375d87.patch";
-      sha256 = "sha256:0q7zsgalwxss6aikhakbdkvvz0g4ac4sa3ncrklm74ksqh56rsgb";
-    })
-  ];
-
   buildInputs = [ glibcLocales ];
 
   checkInputs = [ nose pygments ];

From 48ddd8178045eb06cf7ffd5eea06b4403cc72def Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 10:52:37 +0200
Subject: [PATCH 26/53] python: Cython: 0.29.10 -> 0.29.12

---
 pkgs/development/python-modules/Cython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 3c685e0f34b..13eb58baa0a 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -25,11 +25,11 @@ let
 
 in buildPythonPackage rec {
   pname = "Cython";
-  version = "0.29.10";
+  version = "0.29.12";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "26229570d6787ff3caa932fe9d802960f51a89239b990d275ae845405ce43857";
+    sha256 = "20da832a5e9a8e93d1e1eb64650258956723940968eb585506531719b55b804f";
   };
 
   nativeBuildInputs = [

From 6006bc463062c90c997b5fdb16b0b64757116b4e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 10:56:42 +0200
Subject: [PATCH 27/53] pythonPackages.cytoolz: 0.9.0.1 -> 0.10.0

---
 pkgs/development/python-modules/cytoolz/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/cytoolz/default.nix b/pkgs/development/python-modules/cytoolz/default.nix
index bb345ddc48e..f95da9b75b2 100644
--- a/pkgs/development/python-modules/cytoolz/default.nix
+++ b/pkgs/development/python-modules/cytoolz/default.nix
@@ -10,22 +10,13 @@
 
 buildPythonPackage rec {
   pname = "cytoolz";
-  version = "0.9.0.1";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "84cc06fa40aa310f2df79dd440fc5f84c3e20f01f9f7783fc9c38d0a11ba00e5";
+    sha256 = "ed9f6a07c2bac70d6c597df360d0666d11d2adc90141d54c5c2db08b380a4fac";
   };
 
-  patches = [
-    # temporal fix for a test failure: https://github.com/pytoolz/cytoolz/issues/122
-    (fetchpatch {
-      name = "py37.patch";
-      url = https://salsa.debian.org/python-team/modules/python-cytoolz/raw/5ce4158deefc47475d1e76813f900e6c72ddcc6e/debian/patches/py37.patch;
-      sha256 = "1z29y7s5n751q3f74r3bz0f48yg6izvi68hc4pkwcalxmkq5r1n9";
-    })
-  ];
-
   # Extension types
   disabled = isPyPy;
 

From 6fd572675958f7dd25358bcb85321f7bc866ff36 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 10:56:54 +0200
Subject: [PATCH 28/53] python3Packages.ipykernel: 5.1.0 -> 5.1.1

---
 pkgs/development/python-modules/ipykernel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix
index 043f58cfa5d..94494ed7854 100644
--- a/pkgs/development/python-modules/ipykernel/default.nix
+++ b/pkgs/development/python-modules/ipykernel/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "ipykernel";
-  version = "5.1.0";
+  version = "5.1.1";
   disabled = pythonOlder "3.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0fc0bf97920d454102168ec2008620066878848fcfca06c22b669696212e292f";
+    sha256 = "f0e962052718068ad3b1d8bcc703794660858f58803c3798628817f492a8769c";
   };
 
   checkInputs = [ pytest nose ];

From 68433031c392b579b6042f5d287cacf9e6506b49 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 10:57:26 +0200
Subject: [PATCH 29/53] python: ipywidgets: 7.4.2 -> 7.5.0

---
 pkgs/development/python-modules/ipywidgets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index b91b5d7a775..fd71569e293 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -14,11 +14,11 @@
 
 buildPythonPackage rec {
   pname = "ipywidgets";
-  version = "7.4.2";
+  version = "7.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a3e224f430163f767047ab9a042fc55adbcab0c24bbe6cf9f306c4f89fdf0ba3";
+    sha256 = "cb263c6974aca902d00a435711823bb4aaf6614a5f997f517e15fa84151e8fa2";
   };
 
   # Tests are not distributed

From 82b0f8645d98d29e15e87f621336cc0c1f58ba1c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 10:57:50 +0200
Subject: [PATCH 30/53] python: jupyter_client: 5.2.4 -> 5.3.1

---
 pkgs/development/python-modules/jupyter_client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyter_client/default.nix b/pkgs/development/python-modules/jupyter_client/default.nix
index a4dc719b7af..c3643e674c3 100644
--- a/pkgs/development/python-modules/jupyter_client/default.nix
+++ b/pkgs/development/python-modules/jupyter_client/default.nix
@@ -16,11 +16,11 @@
 
 buildPythonPackage rec {
   pname = "jupyter_client";
-  version = "5.2.4";
+  version = "5.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b5f9cb06105c1d2d30719db5ffb3ea67da60919fb68deaefa583deccd8813551";
+    sha256 = "98e8af5edff5d24e4d31e73bc21043130ae9d955a91aa93fc0bc3b1d0f7b5880";
   };
 
   checkInputs = [ ipykernel ipython mock pytest ];

From 2d520729429ff759d21c0b84b24e2eb2c02e6d03 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 10:58:01 +0200
Subject: [PATCH 31/53] python: jupyter_core: 4.4.0 -> 4.5.0

---
 pkgs/development/python-modules/jupyter_core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyter_core/default.nix b/pkgs/development/python-modules/jupyter_core/default.nix
index e89154c0bc4..88679197be1 100644
--- a/pkgs/development/python-modules/jupyter_core/default.nix
+++ b/pkgs/development/python-modules/jupyter_core/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "jupyter_core";
-  version = "4.4.0";
+  version = "4.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ba70754aa680300306c699790128f6fbd8c306ee5927976cbe48adacf240c0b7";
+    sha256 = "2c6e7c1e9f2ac45b5c2ceea5730bc9008d92fe59d0725eac57b04c0edfba24f7";
   };
 
   checkInputs = [ pytest mock glibcLocales ];

From 1665bde5938e738fee6b637815beb6be38cb22c9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 11:00:04 +0200
Subject: [PATCH 32/53] python: numba: 0.44.0 -> 0.45.0

---
 pkgs/development/python-modules/numba/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index ebb7aac3924..78593e443b1 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -13,12 +13,12 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.44.0";
+  version = "0.45.0";
   pname = "numba";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "56421bfc62f3c7c996ff11d5db7fc410909564e41b55379a82b9188fa4aa22f9";
+    sha256 = "fcea8dc6f9e0f1ddf7bd52a207858539bc14e893c5ee66d8730c3e5b9344c4b3";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";

From 536341c91b96c9b1242bbf8dd320b3864ae5ecf6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 11:00:38 +0200
Subject: [PATCH 33/53] python3Packages.pandas: 0.24.2 -> 0.25.0

---
 pkgs/development/python-modules/pandas/2.nix  | 122 ++++++++++++++++++
 .../python-modules/pandas/default.nix         |   4 +-
 pkgs/top-level/python-packages.nix            |   5 +-
 3 files changed, 128 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/python-modules/pandas/2.nix

diff --git a/pkgs/development/python-modules/pandas/2.nix b/pkgs/development/python-modules/pandas/2.nix
new file mode 100644
index 00000000000..6283addcb6e
--- /dev/null
+++ b/pkgs/development/python-modules/pandas/2.nix
@@ -0,0 +1,122 @@
+# Python 2 expression
+
+{ buildPythonPackage
+, fetchPypi
+, python
+, stdenv
+, pytest
+, glibcLocales
+, cython
+, dateutil
+, scipy
+, moto
+, numexpr
+, pytz
+, xlrd
+, bottleneck
+, sqlalchemy
+, lxml
+, html5lib
+, beautifulsoup4
+, hypothesis
+, openpyxl
+, tables
+, xlwt
+, runtimeShell
+, libcxx ? null
+}:
+
+let
+  inherit (stdenv.lib) optional optionals optionalString;
+  inherit (stdenv) isDarwin;
+
+in buildPythonPackage rec {
+  pname = "pandas";
+  version = "0.24.2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag";
+  };
+
+  checkInputs = [ pytest glibcLocales moto hypothesis ];
+
+  nativeBuildInputs = [ cython ];
+  buildInputs = optional isDarwin libcxx;
+  propagatedBuildInputs = [
+    dateutil
+    scipy
+    numexpr
+    pytz
+    xlrd
+    bottleneck
+    sqlalchemy
+    lxml
+    html5lib
+    beautifulsoup4
+    openpyxl
+    tables
+    xlwt
+  ];
+
+  # For OSX, we need to add a dependency on libcxx, which provides
+  # `complex.h` and other libraries that pandas depends on to build.
+  postPatch = optionalString isDarwin ''
+    cpp_sdk="${libcxx}/include/c++/v1";
+    echo "Adding $cpp_sdk to the setup.py common_include variable"
+    substituteInPlace setup.py \
+      --replace "['pandas/src/klib', 'pandas/src']" \
+                "['pandas/src/klib', 'pandas/src', '$cpp_sdk']"
+  '';
+
+
+  disabledTests = stdenv.lib.concatMapStringsSep " and " (s: "not " + s) ([
+    # since dateutil 0.6.0 the following fails: test_fallback_plural, test_ambiguous_flags, test_ambiguous_compat
+    # was supposed to be solved by https://github.com/dateutil/dateutil/issues/321, but is not the case
+    "test_fallback_plural"
+    "test_ambiguous_flags"
+    "test_ambiguous_compat"
+    # Locale-related
+    "test_names"
+    "test_dt_accessor_datetime_name_accessors"
+    "test_datetime_name_accessors"
+    # Can't import from test folder
+    "test_oo_optimizable"
+    # Disable IO related tests because IO data is no longer distributed
+    "io"
+    # KeyError Timestamp
+    "test_to_excel"
+  ] ++ optionals isDarwin [
+    "test_locale"
+    "test_clipboard"
+  ]);
+
+  doCheck = !stdenv.isAarch64; # upstream doesn't test this architecture
+
+  checkPhase = ''
+    runHook preCheck
+  ''
+  # TODO: Get locale and clipboard support working on darwin.
+  #       Until then we disable the tests.
+  + optionalString isDarwin ''
+    # Fake the impure dependencies pbpaste and pbcopy
+    echo "#!${runtimeShell}" > pbcopy
+    echo "#!${runtimeShell}" > pbpaste
+    chmod a+x pbcopy pbpaste
+    export PATH=$(pwd):$PATH
+  '' + ''
+    LC_ALL="en_US.UTF-8" py.test $out/${python.sitePackages}/pandas --skip-slow --skip-network -k "$disabledTests"
+    runHook postCheck
+  '';
+
+  meta = {
+    # https://github.com/pandas-dev/pandas/issues/14866
+    # pandas devs are no longer testing i686 so safer to assume it's broken
+    broken = stdenv.isi686;
+    homepage = http://pandas.pydata.org/;
+    description = "Python Data Analysis Library";
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = with stdenv.lib.maintainers; [ raskin knedlsepp ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index 7416717585f..6f1c2c68dd3 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -30,11 +30,11 @@ let
 
 in buildPythonPackage rec {
   pname = "pandas";
-  version = "0.24.2";
+  version = "0.25.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "18imlm8xbhcbwy4wa957a1fkamrcb0z988z006jpfda3ki09z4ag";
+    sha256 = "914341ad2d5b1ea522798efa4016430b66107d05781dbfe7cf05eba8f37df995";
   };
 
   checkInputs = [ pytest glibcLocales moto hypothesis ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bdc8496e2d3..e8eef475250 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3929,7 +3929,10 @@ in {
 
   pagerduty = callPackage ../development/python-modules/pagerduty { };
 
-  pandas = callPackage ../development/python-modules/pandas { };
+  pandas = if isPy3k then
+    callPackage ../development/python-modules/pandas { }
+  else
+    callPackage ../development/python-modules/pandas/2.nix { };
 
   panel = callPackage ../development/python-modules/panel { };
 

From 7d0603501a4ea74e33a7604880a61c1fc21257e1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 11:01:13 +0200
Subject: [PATCH 34/53] python: xarray: 0.12.2 -> 0.12.3

---
 pkgs/development/python-modules/xarray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index 930729c052e..de4be062001 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -10,11 +10,11 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "0.12.2";
+  version = "0.12.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0wlpyzxdhcc043g9sjbrflky7xwdyq487v64i532zb2fpjskd59s";
+    sha256 = "9310e610af988acb57a2627b10025a250bcbe172e66d3750a6dd3b3c5357da56";
   };
 
   checkInputs = [ pytest ];

From b038b6db3d28421e71005c6d917dc9ebac908cb7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 11:01:40 +0200
Subject: [PATCH 35/53] python: toolz: 0.9.0 -> 0.10.0

---
 pkgs/development/python-modules/toolz/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/toolz/default.nix b/pkgs/development/python-modules/toolz/default.nix
index 974e3a43bc7..7f506e56413 100644
--- a/pkgs/development/python-modules/toolz/default.nix
+++ b/pkgs/development/python-modules/toolz/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec{
   pname = "toolz";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "929f0a7ea7f61c178bd951bdae93920515d3fbdbafc8e6caf82d752b9b3b31c9";
+    sha256 = "08fdd5ef7c96480ad11c12d472de21acd32359996f69a5259299b540feba4560";
   };
 
   checkInputs = [ nose ];

From e18dc13e507c1013e5f5dc004cab72a5d7fe6e8a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 11:03:08 +0200
Subject: [PATCH 36/53] Revert "pythonPackages.jsonschema: 2.6.0 -> 3.0.1"

Too soon. We need to wait till it is better supported.

This reverts commit ba4384d8650de330fd218f08e8679e1d486bd1dc.
---
 .../python-modules/jsonschema/default.nix     | 52 ++++++-------------
 1 file changed, 16 insertions(+), 36 deletions(-)

diff --git a/pkgs/development/python-modules/jsonschema/default.nix b/pkgs/development/python-modules/jsonschema/default.nix
index dfff4ac4265..db6be9f9918 100644
--- a/pkgs/development/python-modules/jsonschema/default.nix
+++ b/pkgs/development/python-modules/jsonschema/default.nix
@@ -1,51 +1,31 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, attrs
-, pyrsistent
-, setuptools
-, six
-, functools32
-, setuptools_scm
-, perf
-, twisted
-, python
-}:
+{ stdenv, buildPythonPackage, fetchPypi, python
+, nose, mock, vcversioner, functools32 }:
 
 buildPythonPackage rec {
   pname = "jsonschema";
-  version = "3.0.1";
+  version = "2.6.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "03g20i1xfg4qdlk4475pl4pp7y0h37g1fbgs5qhy678q9xb822hc";
+    sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
   };
 
-  nativeBuildInputs = [
-    setuptools_scm
-  ];
+  checkInputs = [ nose mock vcversioner ];
+  propagatedBuildInputs = [ functools32 ];
 
-  propagatedBuildInputs = [
-    attrs
-    pyrsistent
-    setuptools
-    six
-    functools32
-  ];
-
-  checkInputs = [
-    twisted
-    perf
-  ];
-
-  checkPhase = ''
-    ${python.interpreter} setup.py test --test-suite=jsonschema.tests
+  postPatch = ''
+    substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py \
+      --replace "python" "${python.pythonForBuild.interpreter}"
   '';
 
-  meta = with lib; {
-    description = "An implementation of JSON Schema validation for Python";
+  checkPhase = ''
+    nosetests
+  '';
+
+  meta = with stdenv.lib; {
     homepage = https://github.com/Julian/jsonschema;
+    description = "An implementation of JSON Schema validation for Python";
     license = licenses.mit;
-    maintainers = with maintainers; [ costrouc domenkozar ];
+    maintainers = with maintainers; [ domenkozar ];
   };
 }

From 32b76da8449e3db2e78e8ec80356b32b9a9f3622 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 11:12:31 +0200
Subject: [PATCH 37/53] pythonPackages.cmd_2_9: remove alias

---
 pkgs/top-level/python-packages.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e8eef475250..226fed92f7e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3882,8 +3882,7 @@ in {
 
   cachetools = callPackage ../development/python-modules/cachetools {};
 
-  cmd2_9 = callPackage ../development/python-modules/cmd2 {};
-  cmd2 = self.cmd2_9;
+  cmd2 = callPackage ../development/python-modules/cmd2 {};
 
   warlock = callPackage ../development/python-modules/warlock { };
 

From 685386d8d7bba02021ae15b11551084349e7bc34 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 11:13:03 +0200
Subject: [PATCH 38/53] python: tqdm: 4.32.1 -> 4.32.2

---
 pkgs/development/python-modules/tqdm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index c5701902e08..f6038acc1ca 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.32.1";
+  version = "4.32.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0a860bf2683fdbb4812fe539a6c22ea3f1777843ea985cb8c3807db448a0f7ab";
+    sha256 = "25d4c0ea02a305a688e7e9c2cdc8f862f989ef2a4701ab28ee963295f5b109ab";
   };
 
   buildInputs = [ nose coverage glibcLocales flake8 ];

From 36162c8c999815ef9e929231697845743a5dffde Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 20 Jul 2019 11:19:23 +0200
Subject: [PATCH 39/53] python: widgetsnbextension: 3.4.2 -> 3.5.0

---
 .../development/python-modules/widgetsnbextension/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index ab2bd9c4eb1..b2329f4f963 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -7,11 +7,11 @@
 
 buildPythonPackage rec {
   pname = "widgetsnbextension";
-  version = "3.4.2";
+  version = "3.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fa618be8435447a017fd1bf2c7ae922d0428056cfc7449f7a8641edf76b48265";
+    sha256 = "8c9b4d73e388f2484296be18432d3cc0b8d59de243079a0db16a56c5571e1f86";
   };
 
   propagatedBuildInputs = [ notebook ];

From b1bc0645eaa0118757275871c31fe17547cbc477 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Wed, 22 May 2019 07:03:39 -0400
Subject: [PATCH 40/53] gdk-pixbuf: rename from gdk_pixbuf

---
 nixos/modules/services/x11/gdk-pixbuf.nix     |   8 +-
 nixos/tests/gdk-pixbuf.nix                    |   4 +-
 nixos/tests/ostree.nix                        |   2 +-
 pkgs/applications/altcoins/exodus/default.nix |   4 +-
 pkgs/applications/altcoins/parity-ui/env.nix  |   4 +-
 pkgs/applications/audio/amarok/default.nix    |   4 +-
 pkgs/applications/audio/audacious/qt-5.nix    |   4 +-
 .../audio/bitwig-studio/bitwig-studio1.nix    |   4 +-
 pkgs/applications/audio/cmusfm/default.nix    |   4 +-
 pkgs/applications/audio/faust/faust2alsa.nix  |   4 +-
 .../default.nix                               |   4 +-
 pkgs/applications/audio/gtkpod/default.nix    |   4 +-
 pkgs/applications/audio/quodlibet/default.nix |   4 +-
 pkgs/applications/audio/reaper/default.nix    |   4 +-
 pkgs/applications/audio/spotify/default.nix   |   4 +-
 .../applications/audio/transcribe/default.nix |   4 +-
 .../crashplan/crashplan-small-business.nix    |   4 +-
 .../lightdm-enso-os-greeter/default.nix       |   4 +-
 pkgs/applications/editors/atom/env.nix        |   4 +-
 .../applications/editors/brackets/default.nix |   4 +-
 .../editors/lighttable/default.nix            |   4 +-
 .../editors/rednotebook/default.nix           |   4 +-
 .../applications/graphics/avocode/default.nix |   4 +-
 pkgs/applications/graphics/drawio/default.nix |   4 +-
 pkgs/applications/graphics/gimp/default.nix   |   6 +-
 pkgs/applications/graphics/giv/default.nix    |   4 +-
 .../applications/graphics/mypaint/default.nix |   4 +-
 pkgs/applications/graphics/pencil/default.nix |   4 +-
 .../rapid-photo-downloader/default.nix        |   4 +-
 .../graphics/shotwell/default.nix             |   4 +-
 .../applications/graphics/shutter/default.nix |   4 +-
 .../graphics/viewnior/default.nix             |   4 +-
 .../misc/adobe-reader/default.nix             |   4 +-
 pkgs/applications/misc/airtame/default.nix    |   4 +-
 pkgs/applications/misc/batti/default.nix      |   4 +-
 pkgs/applications/misc/dunst/default.nix      |   4 +-
 pkgs/applications/misc/et/default.nix         |   4 +-
 pkgs/applications/misc/evilvte/default.nix    |   4 +-
 .../misc/green-pdfviewer/default.nix          |   4 +-
 pkgs/applications/misc/hyper/default.nix      |   4 +-
 pkgs/applications/misc/kiwix/default.nix      |   4 +-
 pkgs/applications/misc/lutris/default.nix     |   4 +-
 pkgs/applications/misc/mako/default.nix       |   4 +-
 pkgs/applications/misc/mlterm/default.nix     |   4 +-
 pkgs/applications/misc/navit/default.nix      |   4 +-
 pkgs/applications/misc/plank/default.nix      |   4 +-
 .../misc/polar-bookshelf/default.nix          |  10 +-
 pkgs/applications/misc/roxterm/default.nix    |   4 +-
 .../misc/rxvt_unicode/default.nix             |   4 +-
 pkgs/applications/misc/safeeyes/default.nix   |   4 +-
 pkgs/applications/misc/simplenote/default.nix |   4 +-
 pkgs/applications/misc/stretchly/default.nix  |   4 +-
 pkgs/applications/misc/terminus/default.nix   |   4 +-
 pkgs/applications/misc/volnoti/default.nix    |   4 +-
 pkgs/applications/misc/xneur/default.nix      |   4 +-
 pkgs/applications/misc/xxkb/default.nix       |   6 +-
 .../networking/browsers/brave/default.nix     |   4 +-
 .../browsers/firefox-bin/default.nix          |   4 +-
 .../browsers/google-chrome/default.nix        |   4 +-
 .../mozilla-plugins/bluejeans/default.nix     |   4 +-
 .../mozilla-plugins/flashplayer/default.nix   |   4 +-
 .../flashplayer/standalone.nix                |   4 +-
 .../google-talk-plugin/default.nix            |   4 +-
 .../networking/browsers/opera/default.nix     |   4 +-
 .../tor-browser-bundle-bin/default.nix        |   4 +-
 .../networking/browsers/vivaldi/default.nix   |   4 +-
 pkgs/applications/networking/dropbox/cli.nix  |   4 +-
 .../instant-messengers/bluejeans/default.nix  |   4 +-
 .../instant-messengers/coyim/default.nix      |   4 +-
 .../instant-messengers/dino/default.nix       |   4 +-
 .../instant-messengers/discord/base.nix       |   4 +-
 .../instant-messengers/franz/default.nix      |   4 +-
 .../instant-messengers/gitter/default.nix     |   4 +-
 .../instant-messengers/linphone/default.nix   |   4 +-
 .../mattermost-desktop/default.nix            |   4 +-
 .../pidgin-plugins/skype4pidgin/default.nix   |   4 +-
 .../instant-messengers/profanity/default.nix  |   6 +-
 .../signal-desktop/default.nix                |   4 +-
 .../skypeforlinux/default.nix                 |   4 +-
 .../instant-messengers/slack/default.nix      |   4 +-
 .../instant-messengers/stride/default.nix     |   4 +-
 .../instant-messengers/toxic/default.nix      |   4 +-
 .../wire-desktop/default.nix                  |   4 +-
 .../mailreaders/inboxer/default.nix           |   4 +-
 .../mailreaders/mailnag/default.nix           |   4 +-
 .../mailreaders/nylas-mail-bin/default.nix    |   4 +-
 .../mailreaders/thunderbird-bin/default.nix   |   4 +-
 .../networking/mullvad-vpn/default.nix        |   4 +-
 .../networking/p2p/tixati/default.nix         |   4 +-
 .../networking/p2p/transgui/default.nix       |  10 +-
 .../networking/remote/anydesk/default.nix     |   4 +-
 .../remote/citrix-receiver/default.nix        |   6 +-
 .../remote/citrix-workspace/default.nix       |   6 +-
 .../ssb/patchwork-classic/default.nix         |   6 +-
 .../networking/super-productivity/default.nix |   4 +-
 .../applications/office/moneyplex/default.nix |   4 +-
 pkgs/applications/office/pinpoint/default.nix |   4 +-
 pkgs/applications/office/spice-up/default.nix |   4 +-
 pkgs/applications/office/zotero/default.nix   |   8 +-
 .../science/electronics/bitscope/common.nix   |   4 +-
 .../science/logic/verifast/default.nix        |   4 +-
 .../version-management/gitkraken/default.nix  |   4 +-
 pkgs/applications/video/devede/default.nix    |   4 +-
 .../applications/video/lightworks/default.nix |   6 +-
 .../video/webtorrent_desktop/default.nix      |   4 +-
 .../window-managers/awesome/default.nix       |   4 +-
 .../window-managers/dwm/dwm-status.nix        |   4 +-
 .../window-managers/icewm/default.nix         |   4 +-
 .../window-managers/sawfish/default.nix       |   4 +-
 pkgs/applications/window-managers/sway/bg.nix |   4 +-
 .../window-managers/sway/default.nix          |   4 +-
 .../window-managers/sway/lock.nix             |   4 +-
 .../window-managers/trayer/default.nix        |   4 +-
 .../window-managers/way-cooler/crates-io.nix  | 108 +++++++++---------
 .../window-managers/way-cooler/default.nix    |   4 +-
 .../window-managers/yabar/build.nix           |   4 +-
 pkgs/build-support/appimage/default.nix       |   2 +-
 .../rust/default-crate-overrides.nix          |   4 +-
 .../elementary-xfce-icon-theme/default.nix    |   4 +-
 pkgs/data/themes/greybird/default.nix         |   4 +-
 pkgs/data/themes/matcha/default.nix           |   4 +-
 pkgs/data/themes/materia-theme/default.nix    |   4 +-
 pkgs/data/themes/plano/default.nix            |   4 +-
 pkgs/data/themes/plata/default.nix            |   4 +-
 pkgs/data/themes/qogir/default.nix            |   4 +-
 pkgs/data/themes/sierra/default.nix           |   4 +-
 pkgs/data/themes/stilo/default.nix            |   4 +-
 pkgs/data/themes/zuki/default.nix             |   4 +-
 pkgs/desktops/deepin/go-lib/default.nix       |   4 +-
 pkgs/desktops/deepin/qcef/default.nix         |   4 +-
 pkgs/desktops/gnome-3/apps/cheese/default.nix |   6 +-
 .../gnome-3/apps/evolution/default.nix        |   4 +-
 pkgs/desktops/gnome-3/apps/glade/default.nix  |   4 +-
 .../gnome-3/apps/gnome-books/default.nix      |   4 +-
 .../gnome-3/apps/gnome-clocks/default.nix     |   4 +-
 .../gnome-3/apps/gnome-documents/default.nix  |   4 +-
 .../gnome-3/apps/gnome-maps/default.nix       |   4 +-
 .../gnome-3/apps/gnome-music/default.nix      |   4 +-
 .../gnome-3/apps/gnome-photos/default.nix     |   4 +-
 .../apps/gnome-sound-recorder/default.nix     |   4 +-
 pkgs/desktops/gnome-3/apps/polari/default.nix |   4 +-
 .../core/adwaita-icon-theme/default.nix       |   4 +-
 .../desktops/gnome-3/core/empathy/default.nix |   4 +-
 pkgs/desktops/gnome-3/core/eog/default.nix    |   6 +-
 .../gnome-3/core/epiphany/default.nix         |   4 +-
 pkgs/desktops/gnome-3/core/evince/default.nix |   4 +-
 pkgs/desktops/gnome-3/core/gjs/default.nix    |   4 +-
 .../core/gnome-control-center/default.nix     |   6 +-
 .../core/gnome-remote-desktop/default.nix     |   4 +-
 .../gnome-3/core/gnome-shell/default.nix      |   4 +-
 .../core/gnome-system-monitor/default.nix     |   4 +-
 .../core/gnome-themes-extra/default.nix       |   4 +-
 .../gnome-3/core/nautilus/default.nix         |   4 +-
 .../gnome-3/core/simple-scan/default.nix      |   4 +-
 pkgs/desktops/gnome-3/core/sushi/default.nix  |   4 +-
 pkgs/desktops/gnome-3/core/totem/default.nix  |   4 +-
 .../desktops/gnome-3/games/atomix/default.nix |   4 +-
 pkgs/desktops/gnome-3/games/iagno/default.nix |   4 +-
 .../gnome-3/games/lightsoff/default.nix       |   4 +-
 .../gnome-3/games/quadrapassel/default.nix    |   4 +-
 pkgs/desktops/gnome-3/games/tali/default.nix  |   4 +-
 .../gnome-3/misc/gnome-tweaks/default.nix     |   4 +-
 pkgs/desktops/lxde/core/lxpanel/default.nix   |   4 +-
 pkgs/desktops/mate/caja-dropbox/default.nix   |   4 +-
 pkgs/desktops/mate/mate-themes/default.nix    |   4 +-
 pkgs/desktops/maxx/default.nix                |   6 +-
 pkgs/desktops/xfce/core/tumbler.nix           |   4 +-
 pkgs/desktops/xfce4-14/thunar/default.nix     |   4 +-
 pkgs/desktops/xfce4-14/tumbler/default.nix    |   4 +-
 .../arduino/arduino-core/default.nix          |   6 +-
 .../adoptopenjdk-bin/jdk-linux-base.nix       |   4 +-
 .../compilers/cudatoolkit/default.nix         |   4 +-
 .../compilers/factor-lang/default.nix         |   8 +-
 pkgs/development/compilers/fpc/lazarus.nix    |   4 +-
 .../compilers/jetbrains-jdk/default.nix       |   4 +-
 .../compilers/oraclejdk/jdk-linux-base.nix    |   4 +-
 pkgs/development/compilers/zulu/8.nix         |   4 +-
 pkgs/development/compilers/zulu/default.nix   |   4 +-
 .../libraries/appstream-glib/default.nix      |   4 +-
 .../libraries/clutter-gst/default.nix         |   4 +-
 pkgs/development/libraries/cogl/default.nix   |   4 +-
 pkgs/development/libraries/gcr/default.nix    |   4 +-
 .../libraries/gdk-pixbuf/default.nix          |   1 -
 pkgs/development/libraries/geis/default.nix   |   4 +-
 .../development/libraries/geoclue/default.nix |   4 +-
 pkgs/development/libraries/gom/default.nix    |   4 +-
 .../libraries/gstreamer/good/default.nix      |   4 +-
 .../legacy/gst-plugins-good/default.nix       |   4 +-
 pkgs/development/libraries/gtk+/2.x.nix       |   4 +-
 pkgs/development/libraries/gtk+/3.x.nix       |   4 +-
 pkgs/development/libraries/gtkd/default.nix   |   8 +-
 .../libraries/java/swt/default.nix            |   4 +-
 pkgs/development/libraries/lasem/default.nix  |   4 +-
 pkgs/development/libraries/libcef/default.nix |   4 +-
 .../development/libraries/libgpod/default.nix |   4 +-
 pkgs/development/libraries/libgsf/default.nix |   4 +-
 .../libraries/libmediaart/default.nix         |   4 +-
 .../libraries/libnotify/default.nix           |   4 +-
 .../development/libraries/librsvg/default.nix |   8 +-
 .../libraries/qt-4.x/4.8/default.nix          |   4 +-
 .../ocaml-modules/ocaml-cairo/default.nix     |   4 +-
 .../python-modules/cairocffi/0_9.nix          |   4 +-
 .../python-modules/cairocffi/default.nix      |   4 +-
 .../cairocffi/dlopen-paths-0.9.patch          |  12 +-
 .../cairocffi/dlopen-paths.patch              |  12 +-
 .../python-modules/cairocffi/generic.nix      |   4 +-
 .../python-modules/pyglet/default.nix         |   4 +-
 .../ruby-modules/gem-config/default.nix       |   6 +-
 pkgs/development/tools/node-webkit/nw12.nix   |   4 +-
 pkgs/development/tools/nwjs/default.nix       |   4 +-
 .../tools/react-native-debugger/default.nix   |   4 +-
 .../tools/selenium/chromedriver/default.nix   |   4 +-
 pkgs/development/tools/thrust/default.nix     |   4 +-
 pkgs/development/tools/unity3d/default.nix    |  10 +-
 pkgs/development/web/insomnia/default.nix     |   8 +-
 pkgs/development/web/postman/default.nix      |   2 +-
 pkgs/games/arena/default.nix                  |   4 +-
 pkgs/games/planetaryannihilation/default.nix  |   6 +-
 pkgs/games/steam/chrootenv.nix                |   2 +-
 pkgs/misc/emulators/cdemu/analyzer.nix        |   4 +-
 pkgs/misc/emulators/cdemu/gui.nix             |   4 +-
 pkgs/misc/emulators/epsxe/default.nix         |   4 +-
 pkgs/misc/emulators/kega-fusion/default.nix   |   4 +-
 pkgs/misc/emulators/nestopia/default.nix      |   4 +-
 pkgs/misc/solfege/default.nix                 |   4 +-
 pkgs/misc/themes/adapta/default.nix           |   4 +-
 pkgs/misc/themes/equilux-theme/default.nix    |   4 +-
 pkgs/misc/themes/numix-solarized/default.nix  |   4 +-
 pkgs/misc/themes/numix/default.nix            |   4 +-
 pkgs/os-specific/linux/usermount/default.nix  |   4 +-
 pkgs/tools/X11/caffeine-ng/default.nix        |   4 +-
 pkgs/tools/X11/xpra/default.nix               |   4 +-
 pkgs/tools/audio/gvolicon/default.nix         |   4 +-
 pkgs/tools/graphics/blur-effect/default.nix   |   4 +-
 pkgs/tools/inputmethods/ibus/default.nix      |   4 +-
 pkgs/tools/misc/birdfont/default.nix          |   4 +-
 pkgs/tools/misc/staruml/default.nix           |   4 +-
 pkgs/tools/misc/sweep-visualizer/default.nix  |   8 +-
 .../misc/system-config-printer/default.nix    |   4 +-
 pkgs/tools/networking/driftnet/default.nix    |   4 +-
 pkgs/tools/security/encryptr/default.nix      |   4 +-
 pkgs/tools/security/keybase/gui.nix           |   4 +-
 pkgs/tools/system/collectd/default.nix        |   4 +-
 pkgs/tools/system/ddrescueview/default.nix    |   4 +-
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 +-
 246 files changed, 581 insertions(+), 581 deletions(-)

diff --git a/nixos/modules/services/x11/gdk-pixbuf.nix b/nixos/modules/services/x11/gdk-pixbuf.nix
index 2dc8eabd95a..9ad926369ec 100644
--- a/nixos/modules/services/x11/gdk-pixbuf.nix
+++ b/nixos/modules/services/x11/gdk-pixbuf.nix
@@ -5,21 +5,21 @@ with lib;
 let
   cfg = config.services.xserver.gdk-pixbuf;
 
-  # Get packages to generate the cache for. We always include gdk_pixbuf.
-  effectivePackages = unique ([pkgs.gdk_pixbuf] ++ cfg.modulePackages);
+  # Get packages to generate the cache for. We always include gdk-pixbuf.
+  effectivePackages = unique ([pkgs.gdk-pixbuf] ++ cfg.modulePackages);
 
   # Generate the cache file by running gdk-pixbuf-query-loaders for each
   # package and concatenating the results.
   loadersCache = pkgs.runCommand "gdk-pixbuf-loaders.cache" { preferLocalBuild = true; } ''
     (
       for package in ${concatStringsSep " " effectivePackages}; do
-        module_dir="$package/${pkgs.gdk_pixbuf.moduleDir}"
+        module_dir="$package/${pkgs.gdk-pixbuf.moduleDir}"
         if [[ ! -d $module_dir ]]; then
           echo "Warning (services.xserver.gdk-pixbuf): missing module directory $module_dir" 1>&2
           continue
         fi
         GDK_PIXBUF_MODULEDIR="$module_dir" \
-          ${pkgs.gdk_pixbuf.dev}/bin/gdk-pixbuf-query-loaders
+          ${pkgs.gdk-pixbuf.dev}/bin/gdk-pixbuf-query-loaders
       done
     ) > "$out"
   '';
diff --git a/nixos/tests/gdk-pixbuf.nix b/nixos/tests/gdk-pixbuf.nix
index 005c5111da2..9a62b593f46 100644
--- a/nixos/tests/gdk-pixbuf.nix
+++ b/nixos/tests/gdk-pixbuf.nix
@@ -3,12 +3,12 @@ import ./make-test.nix ({ pkgs, ... }: {
   name = "gdk-pixbuf";
 
   meta = {
-    maintainers = pkgs.gdk_pixbuf.meta.maintainers;
+    maintainers = pkgs.gdk-pixbuf.meta.maintainers;
   };
 
   machine = { pkgs, ... }: {
     environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
-    environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk_pixbuf.installedTests}/share" ];
+    environment.variables.XDG_DATA_DIRS = [ "${pkgs.gdk-pixbuf.installedTests}/share" ];
 
     # Tests allocate a lot of memory trying to exploit a CVE
     # but qemu-system-i386 has a 2047M memory limit
diff --git a/nixos/tests/ostree.nix b/nixos/tests/ostree.nix
index 8b19004874e..d7ad84a1a5f 100644
--- a/nixos/tests/ostree.nix
+++ b/nixos/tests/ostree.nix
@@ -12,7 +12,7 @@ import ./make-test.nix ({ pkgs, lib, ... }: {
       gnome-desktop-testing ostree gnupg (python3.withPackages (p: with p; [ pyyaml ]))
     ];
 
-    environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk_pixbuf atk ]); # for GJS tests
+    environment.variables.GI_TYPELIB_PATH = lib.makeSearchPath "lib/girepository-1.0" (with pkgs; [ gtk3 pango.out ostree gdk-pixbuf atk ]); # for GJS tests
   };
 
   testScript = ''
diff --git a/pkgs/applications/altcoins/exodus/default.nix b/pkgs/applications/altcoins/exodus/default.nix
index 421f739a7a8..bc354a5213e 100644
--- a/pkgs/applications/altcoins/exodus/default.nix
+++ b/pkgs/applications/altcoins/exodus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, unzip, glib, systemd, nss, nspr, gtk3-x11, gnome2,
-atk, cairo, gdk_pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
+atk, cairo, gdk-pixbuf, xorg, xorg_sys_opengl, utillinux, alsaLib, dbus, at-spi2-atk,
 cups, vivaldi-ffmpeg-codecs, libpulseaudio }:
 
 stdenv.mkDerivation rec {
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 			gnome2.pango
 			atk
 			cairo
-			gdk_pixbuf
+			gdk-pixbuf
 			xorg.libX11
 			xorg.libxcb
 			xorg.libXcomposite
diff --git a/pkgs/applications/altcoins/parity-ui/env.nix b/pkgs/applications/altcoins/parity-ui/env.nix
index 625a008af91..a878bbf2e3e 100644
--- a/pkgs/applications/altcoins/parity-ui/env.nix
+++ b/pkgs/applications/altcoins/parity-ui/env.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
+, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
 , nss, xorg, libcap, systemd, libnotify, libsecret, gnome2 }:
 
 let
   packages = [
     stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
-    fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
+    fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss
     xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
     xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
     xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix
index 855d31aadbb..a4aa6428097 100644
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@@ -3,7 +3,7 @@
 , qca-qt5, qjson, qtquickcontrols2, qtscript, qtwebengine
 , karchive, kcmutils, kconfig, kdnssd, kguiaddons, kinit, kirigami2, knewstuff, knotifyconfig, ktexteditor, kwindowsystem
 , fftw, phonon, plasma-framework, threadweaver
-, curl, ffmpeg, gdk_pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
+, curl, ffmpeg, gdk-pixbuf, libaio, libmtp, loudmouth, lzo, lz4, mysql57, pcre, snappy, taglib, taglib_extras
 }:
 
 let
@@ -29,7 +29,7 @@ in mkDerivation {
     qca-qt5 qjson qtquickcontrols2 qtscript qtwebengine
     karchive kcmutils kconfig kdnssd kguiaddons kinit kirigami2 knewstuff knotifyconfig ktexteditor kwindowsystem
     phonon plasma-framework threadweaver
-    curl fftw ffmpeg gdk_pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
+    curl fftw ffmpeg gdk-pixbuf libaio libmtp loudmouth lz4 lzo mysql57.server mysql57.server.static
     pcre snappy taglib taglib_extras
   ];
 
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index 019bde7cc64..baf7b108e50 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, fetchurl, fetchpatch,
   gettext, pkgconfig,
   qtbase,
-  alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
+  alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk-pixbuf, lame, libbs2b,
   libcddb, libcdio, libcue, libjack2, libmad, libmms, libmodplug,
   libmowgli, libnotify, libogg, libpulseaudio, libsamplerate, libsidplayfp,
   libsndfile, libvorbis, libxml2, lirc, mpg123, neon, qtmultimedia, soxr,
@@ -45,7 +45,7 @@ mkDerivation {
     qtbase
 
     # Plugin dependencies
-    alsaLib curl faad2 ffmpeg flac fluidsynth gdk_pixbuf lame libbs2b libcddb
+    alsaLib curl faad2 ffmpeg flac fluidsynth gdk-pixbuf lame libbs2b libcddb
     libcdio libcue libjack2 libmad libmms libmodplug libmowgli
     libnotify libogg libpulseaudio libsamplerate libsidplayfp libsndfile
     libvorbis libxml2 lirc mpg123 neon qtmultimedia soxr wavpack
diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
index 125c0f7a753..31716fce1c2 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio1.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk_pixbuf
+{ stdenv, fetchurl, alsaLib, bzip2, cairo, dpkg, freetype, gdk-pixbuf
 , wrapGAppsHook, gtk2, gtk3, harfbuzz, jdk, lib, xorg
 , libbsd, libjack2, libpng, ffmpeg
 , libxkbcommon
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   dontWrapGApps = true; # we only want $gappsWrapperArgs here
 
   buildInputs = with xorg; [
-    alsaLib bzip2.out cairo freetype gdk_pixbuf gtk2 gtk3 harfbuzz libX11 libXau
+    alsaLib bzip2.out cairo freetype gdk-pixbuf gtk2 gtk3 harfbuzz libX11 libXau
     libXcursor libXdmcp libXext libXfixes libXrender libbsd libjack2 libpng libxcb
     libxkbfile pixman xcbutil xcbutilwm zlib
   ];
diff --git a/pkgs/applications/audio/cmusfm/default.nix b/pkgs/applications/audio/cmusfm/default.nix
index e528e9699a7..2147a84f24b 100644
--- a/pkgs/applications/audio/cmusfm/default.nix
+++ b/pkgs/applications/audio/cmusfm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk_pixbuf }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, curl, libnotify, gdk-pixbuf }:
 
 stdenv.mkDerivation rec {
   version = "2018-10-11";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   # building
   configureFlags = [ "--enable-libnotify" ];
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ curl libnotify gdk_pixbuf ];
+  buildInputs = [ curl libnotify gdk-pixbuf ];
 
   meta = with stdenv.lib; {
     description = "Last.fm and Libre.fm standalone scrobbler for the cmus music player";
diff --git a/pkgs/applications/audio/faust/faust2alsa.nix b/pkgs/applications/audio/faust/faust2alsa.nix
index 17cec46f6c6..6af5af9bbaf 100644
--- a/pkgs/applications/audio/faust/faust2alsa.nix
+++ b/pkgs/applications/audio/faust/faust2alsa.nix
@@ -4,7 +4,7 @@
 , cairo
 , fontconfig
 , freetype
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , gtk2
 , pango
@@ -20,7 +20,7 @@ faust.wrapWithBuildEnv {
     cairo
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gtk2
     pango
diff --git a/pkgs/applications/audio/google-play-music-desktop-player/default.nix b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
index 5951572dd24..7716b1e0c35 100644
--- a/pkgs/applications/audio/google-play-music-desktop-player/default.nix
+++ b/pkgs/applications/audio/google-play-music-desktop-player/default.nix
@@ -1,5 +1,5 @@
 { stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fontconfig, freetype
-, fetchurl, GConf, gdk_pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
+, fetchurl, GConf, gdk-pixbuf, glib, gtk2, gtk3, libpulseaudio, makeWrapper, nspr
 , nss, pango, udev, xorg
 }:
 
@@ -16,7 +16,7 @@ let
     fontconfig
     freetype
     GConf
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gtk2
     gtk3
diff --git a/pkgs/applications/audio/gtkpod/default.nix b/pkgs/applications/audio/gtkpod/default.nix
index 0727ab56f7d..e01dbc1d30f 100644
--- a/pkgs/applications/audio/gtkpod/default.nix
+++ b/pkgs/applications/audio/gtkpod/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, wrapGAppsHook, intltool, libgpod, curl, flac,
   gnome3, gtk3, gettext, perlPackages, flex, libid3tag, gdl,
-  libvorbis, gdk_pixbuf }:
+  libvorbis, gdk-pixbuf }:
 
 stdenv.mkDerivation rec {
   version = "2.1.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig wrapGAppsHook intltool ];
   buildInputs = [
     curl gettext
-    flex libgpod libid3tag flac libvorbis gtk3 gdk_pixbuf
+    flex libgpod libid3tag flac libvorbis gtk3 gdk-pixbuf
     gdl gnome3.adwaita-icon-theme gnome3.anjuta
   ] ++ (with perlPackages; [ perl XMLParser ]);
 
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index d457f25e316..8db837105f8 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk_pixbuf,
+{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk-pixbuf,
   tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection,
   gst_all_1, withGstPlugins ? true,
   xineBackend ? false, xineLib,
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
 
   checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
 
-  buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk_pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
+  buildInputs = [ gnome3.adwaita-icon-theme libsoup glib glib-networking gtk3 webkitgtk gdk-pixbuf keybinder3 gtksourceview libmodplug libappindicator-gtk3 kakasi gobject-introspection ]
     ++ (if xineBackend then [ xineLib ] else with gst_all_1;
     [ gstreamer gst-plugins-base ] ++ optionals withGstPlugins [ gst-plugins-good gst-plugins-ugly gst-plugins-bad ]);
 
diff --git a/pkgs/applications/audio/reaper/default.nix b/pkgs/applications/audio/reaper/default.nix
index 95a08b59b00..0c1d91254da 100644
--- a/pkgs/applications/audio/reaper/default.nix
+++ b/pkgs/applications/audio/reaper/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, autoPatchelfHook, makeWrapper
 , alsaLib, xorg
-, gtk3, pango, gdk_pixbuf, cairo, glib, freetype
+, gtk3, pango, gdk-pixbuf, cairo, glib, freetype
 , libpulseaudio, xdg_utils
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     xorg.libX11
     xorg.libXi
 
-    gdk_pixbuf
+    gdk-pixbuf
     pango
     cairo
     glib
diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 6e926fe11c3..77aa7994994 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, squashfsTools, xorg, alsaLib, makeWrapper, openssl, freetype
-, glib, pango, cairo, atk, gdk_pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
+, glib, pango, cairo, atk, gdk-pixbuf, gtk2, cups, nspr, nss, libpng, libnotify
 , libgcrypt, systemd, fontconfig, dbus, expat, ffmpeg_3, curl, zlib, gnome3
 , at-spi2-atk
 }:
@@ -32,7 +32,7 @@ let
     ffmpeg_3
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gtk2
     libgcrypt
diff --git a/pkgs/applications/audio/transcribe/default.nix b/pkgs/applications/audio/transcribe/default.nix
index 29021e870af..74079041948 100644
--- a/pkgs/applications/audio/transcribe/default.nix
+++ b/pkgs/applications/audio/transcribe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk_pixbuf
+{ stdenv, fetchzip, wrapGAppsHook, alsaLib, atk, cairo, gdk-pixbuf
 , glib, gst_all_1,  gtk3, libSM, libX11, libpng12, pango, zlib }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   dontPatchELF = true;
 
   libPath = with gst_all_1; stdenv.lib.makeLibraryPath [
-    stdenv.cc.cc glib gtk3 atk pango cairo gdk_pixbuf alsaLib
+    stdenv.cc.cc glib gtk3 atk pango cairo gdk-pixbuf alsaLib
     libX11 libSM libpng12 gstreamer gst-plugins-base zlib
   ];
 
diff --git a/pkgs/applications/backup/crashplan/crashplan-small-business.nix b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
index 2016d21c592..5db4badeb6c 100644
--- a/pkgs/applications/backup/crashplan/crashplan-small-business.nix
+++ b/pkgs/applications/backup/crashplan/crashplan-small-business.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, getopt, jre, cpio, gawk, gnugrep, gnused,
-  procps, which, gtk2, atk, glib, pango, gdk_pixbuf, cairo, freetype,
+  procps, which, gtk2, atk, glib, pango, gdk-pixbuf, cairo, freetype,
   fontconfig, dbus, gconf, nss, nspr, alsaLib, cups, expat, udev,
   libX11, libxcb, libXi, libXcursor, libXdamage, libXrandr, libXcomposite,
   libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nodePackages,
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux-x86-64.so.2 $out/electron/crashplan
     wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${stdenv.lib.makeLibraryPath [
-      stdenv.cc.cc.lib gtk2 atk glib pango gdk_pixbuf cairo freetype
+      stdenv.cc.cc.lib gtk2 atk glib pango gdk-pixbuf cairo freetype
       fontconfig dbus gconf nss nspr alsaLib cups expat udev
       libX11 libxcb libXi libXcursor libXdamage libXrandr libXcomposite
       libXext libXfixes libXrender libXtst libXScrnSaver]}"
diff --git a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
index 38270a25c9c..45fd3cb8cbb 100644
--- a/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
+++ b/pkgs/applications/display-managers/lightdm-enso-os-greeter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, pkgconfig
 , dbus, pcre, epoxy, libXdmcp, at-spi2-core, libxklavier, libxkbcommon, libpthreadstubs
-, gtk3, vala, cmake, libgee, libX11, lightdm, gdk_pixbuf, clutter-gtk }:
+, gtk3, vala, cmake, libgee, libX11, lightdm, gdk-pixbuf, clutter-gtk }:
 
 stdenv.mkDerivation rec {
   version = "0.2.1";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     libX11
     lightdm
     libXdmcp
-    gdk_pixbuf
+    gdk-pixbuf
     clutter-gtk
     libxklavier
     at-spi2-core
diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index da78c39324a..46dd4a22864 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, zlib, glib, alsaLib, dbus, gtk3, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
+, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
 , gconf, nss, xorg, libcap, systemd, libnotify, libsecret
 }:
 
 let
   packages = [
     stdenv.cc.cc zlib glib dbus gtk3 atk pango freetype libgnome-keyring3
-    fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
+    fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss
     xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
     xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
     xorg.libXcursor xorg.libxkbfile xorg.libXScrnSaver libcap systemd libnotify
diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index ce9f10f39c4..17ae4052198 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
+{ stdenv, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf
 , cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }:
 with stdenv.lib;
 
 let
   bracketsLibs = makeLibraryPath [
-    gtk2 glib gdk_pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat
+    gtk2 glib gdk-pixbuf stdenv.cc.cc.lib alsaLib nss nspr gconf cups libgcrypt_1_5 dbus systemd libXdamage expat
   ];
 in
 stdenv.mkDerivation rec {
diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index dfd6543c598..c3a280aed92 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem
-, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk_pixbuf
+, dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf
 , cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify
 }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
       stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3 nss
-      fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf
+      fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr gnome2.GConf
       xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
       xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
       xorg.libXcursor
diff --git a/pkgs/applications/editors/rednotebook/default.nix b/pkgs/applications/editors/rednotebook/default.nix
index de9a089ec8c..11154250e58 100644
--- a/pkgs/applications/editors/rednotebook/default.nix
+++ b/pkgs/applications/editors/rednotebook/default.nix
@@ -1,5 +1,5 @@
 { lib, buildPythonApplication, fetchFromGitHub
-, gdk_pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
+, gdk-pixbuf, glib, gobject-introspection, gtk3, gtksourceview, pango, webkitgtk
 , pygobject3, pyyaml
 }:
 
@@ -20,7 +20,7 @@ buildPythonApplication rec {
   nativeBuildInputs = [ gobject-introspection ];
 
   propagatedBuildInputs = [
-    gdk_pixbuf glib gtk3 gtksourceview pango webkitgtk
+    gdk-pixbuf glib gtk3 gtksourceview pango webkitgtk
     pygobject3 pyyaml
   ];
 
diff --git a/pkgs/applications/graphics/avocode/default.nix b/pkgs/applications/graphics/avocode/default.nix
index 57631037cd0..140548cd20a 100644
--- a/pkgs/applications/graphics/avocode/default.nix
+++ b/pkgs/applications/graphics/avocode/default.nix
@@ -1,5 +1,5 @@
 { stdenv, makeDesktopItem, fetchurl, unzip
-, gdk_pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
+, gdk-pixbuf, glib, gtk3, atk, at-spi2-atk, pango, cairo, freetype, fontconfig, dbus, nss, nspr, alsaLib, cups, expat, udev, gnome3
 , xorg, mozjpeg, makeWrapper, wrapGAppsHook, hicolor-icon-theme, libuuid
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   libPath = stdenv.lib.makeLibraryPath (with xorg; [
     stdenv.cc.cc.lib
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gtk3
     atk
diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix
index 70cf1c149ab..4d5dbeb35b1 100644
--- a/pkgs/applications/graphics/drawio/default.nix
+++ b/pkgs/applications/graphics/drawio/default.nix
@@ -2,7 +2,7 @@
 
 # Dynamic libraries
 , alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, dbus, cups, expat
-, gdk_pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor
+, gdk-pixbuf, glib, gtk3, libX11, libXScrnSaver, libXcomposite, libXcursor
 , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst
 , libxcb, libuuid, nspr, nss, pango
 
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     cups
     dbus
     expat
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gtk3
     libX11
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 16b520fa7ed..e3994b1b412 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, substituteAll, pkgconfig, intltool, babl, gegl, gtk2, glib, gdk_pixbuf, isocodes
+{ stdenv, fetchurl, substituteAll, pkgconfig, 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
 , python2Packages, libexif, gettext, xorg, glib-networking, libmypaint, gexiv2
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool gettext wrapPython ];
   propagatedBuildInputs = [ gegl ]; # needed by gimp-2.0.pc
   buildInputs = [
-    babl gegl gtk2 glib gdk_pixbuf pango cairo gexiv2 harfbuzz isocodes
+    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 pygtk libexif xorg.libXpm glib-networking libmypaint mypaint-brushes
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
   pythonPath = [ pygtk ];
 
   # Check if librsvg was built with --disable-pixbuf-loader.
-  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk_pixbuf.moduleDir}";
+  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${librsvg}/${gdk-pixbuf.moduleDir}";
 
   preConfigure = ''
     # The check runs before glib-networking is registered
diff --git a/pkgs/applications/graphics/giv/default.nix b/pkgs/applications/graphics/giv/default.nix
index c5eb126cfbf..ec708ad971a 100644
--- a/pkgs/applications/graphics/giv/default.nix
+++ b/pkgs/applications/graphics/giv/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gdk_pixbuf, scons, pkgconfig, gtk2, glib
+{ stdenv, fetchFromGitHub, gdk-pixbuf, scons, pkgconfig, gtk2, glib
 , pcre, cfitsio, perl, gob2, vala, libtiff, json-glib }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   patches = [ ./build.patch ];
 
   nativeBuildInputs = [ scons pkgconfig vala perl gob2 ];
-  buildInputs = [ gdk_pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
+  buildInputs = [ gdk-pixbuf gtk2 glib pcre cfitsio libtiff json-glib ];
 
   meta = with stdenv.lib; {
     description = "Cross platform image and hierarchical vector viewer based";
diff --git a/pkgs/applications/graphics/mypaint/default.nix b/pkgs/applications/graphics/mypaint/default.nix
index 36c7e7e2fb3..466ab3e26fb 100644
--- a/pkgs/applications/graphics/mypaint/default.nix
+++ b/pkgs/applications/graphics/mypaint/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, gtk3, intltool, json_c, lcms2, libpng, librsvg, gobject-introspection, hicolor-icon-theme
-, gdk_pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
+, gdk-pixbuf, pkgconfig, python2Packages, scons, swig, wrapGAppsHook }:
 
 let
   inherit (python2Packages) python pycairo pygobject3 numpy;
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gtk3 gdk_pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme
+    gtk3 gdk-pixbuf json_c lcms2 libpng librsvg pycairo pygobject3 python hicolor-icon-theme
   ];
 
   propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix
index de758271004..f622d3f388e 100644
--- a/pkgs/applications/graphics/pencil/default.nix
+++ b/pkgs/applications/graphics/pencil/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lib, makeWrapper,
   # build dependencies
   alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
-  freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
+  freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg,
   glibc, systemd
 }:
 
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
       expat
       fontconfig
       freetype
-      gdk_pixbuf
+      gdk-pixbuf
       glib
       gnome2.GConf
       gnome2.gtk
diff --git a/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index b244bed9294..5991a3351ee 100644
--- a/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/pkgs/applications/graphics/rapid-photo-downloader/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, python3Packages
 , file, intltool, gobject-introspection, libgudev
 , udisks, gexiv2, gst_all_1, libnotify
-, exiftool, gdk_pixbuf, libmediainfo, vmtouch
+, exiftool, gdk-pixbuf, libmediainfo, vmtouch
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -33,7 +33,7 @@ python3Packages.buildPythonApplication rec {
   # NOTE: Without gobject-introspection in buildInputs, launching fails with
   #       "Namespace [Notify / GExiv2 / GUdev] not available"
   buildInputs = [
-    gdk_pixbuf
+    gdk-pixbuf
     gexiv2
     gobject-introspection
     gst_all_1.gst-libav
diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix
index 294737ee733..79bc743fbf0 100644
--- a/pkgs/applications/graphics/shotwell/default.nix
+++ b/pkgs/applications/graphics/shotwell/default.nix
@@ -24,7 +24,7 @@
 , librest
 , gettext
 , desktop-file-utils
-, gdk_pixbuf
+, gdk-pixbuf
 , librsvg
 , wrapGAppsHook
 , gobject-introspection
@@ -77,7 +77,7 @@ stdenv.mkDerivation rec {
     libraw
     json-glib
     glib
-    gdk_pixbuf
+    gdk-pixbuf
     librsvg
     librest
     gcr
diff --git a/pkgs/applications/graphics/shutter/default.nix b/pkgs/applications/graphics/shutter/default.nix
index 18754b2b854..527a21f93fe 100644
--- a/pkgs/applications/graphics/shutter/default.nix
+++ b/pkgs/applications/graphics/shutter/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk_pixbuf, librsvg
+{ stdenv, fetchurl, perlPackages, makeWrapper, imagemagick, gdk-pixbuf, librsvg
 , hicolor-icon-theme, procps
 }:
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ perlPackages.perl procps gdk_pixbuf librsvg ] ++ perlModules;
+  buildInputs = [ perlPackages.perl procps gdk-pixbuf librsvg ] ++ perlModules;
 
   installPhase = ''
     mkdir -p "$out"
diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix
index 5afd7a0237d..48930ccbbb9 100644
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms
-, intltool, gettext, shared-mime-info, glib, gdk_pixbuf, perl}:
+, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
 
 stdenv.mkDerivation rec {
   name = "viewnior-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   buildInputs =
     [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext
-      shared-mime-info glib gdk_pixbuf perl
+      shared-mime-info glib gdk-pixbuf perl
     ];
 
   preFixup = ''
diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index 0ca12a0096e..d1e4856e052 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libX11, cups, zlib, libxml2, pango, atk, gtk2, glib
-, gdk_pixbuf }:
+, gdk-pixbuf }:
 
 assert stdenv.hostPlatform.system == "i686-linux";
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
   # versions.
 
   libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk_pixbuf ];
+    [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk2 glib gdk-pixbuf ];
 
   passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
 
diff --git a/pkgs/applications/misc/airtame/default.nix b/pkgs/applications/misc/airtame/default.nix
index 3e5bf8df4a7..50582d94ff4 100644
--- a/pkgs/applications/misc/airtame/default.nix
+++ b/pkgs/applications/misc/airtame/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl, makeDesktopItem, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, ffmpeg, fontconfig, freetype
-, gdk_pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
+, gdk-pixbuf, glib, glibc, gnome2, gtk2, libX11, libXScrnSaver, libXcomposite
 , libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender
 , libXtst, libopus, libpulseaudio, libxcb, nspr, nss, pango, udev, x264
 }:
 
 let libPath = lib.makeLibraryPath [
-  alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk_pixbuf
+  alsaLib atk cairo cups curl dbus expat ffmpeg fontconfig freetype gdk-pixbuf
   glib glibc gnome2.GConf gtk2 libopus nspr nss pango stdenv.cc.cc udev x264
   libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes
   libXi libXrandr libXrender libXtst libpulseaudio libxcb
diff --git a/pkgs/applications/misc/batti/default.nix b/pkgs/applications/misc/batti/default.nix
index 9322aefb2d6..abb3eb33536 100644
--- a/pkgs/applications/misc/batti/default.nix
+++ b/pkgs/applications/misc/batti/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , pkgconfig, gettext, pythonPackages
-, gtk2, gdk_pixbuf, upower
+, gtk2, gdk-pixbuf, upower
 , makeWrapper }:
 
 let
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = with stdenv.lib;
-  [ pkgconfig gettext python gtk2 pygtk dbus-python gdk_pixbuf upower makeWrapper ];
+  [ pkgconfig gettext python gtk2 pygtk dbus-python gdk-pixbuf upower makeWrapper ];
 
   dontConfigure = true;
 
diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index 35073db2ae1..7da2ae421d7 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, makeWrapper
 , pkgconfig, which, perl, libXrandr
-, cairo, dbus, systemd, gdk_pixbuf, glib, libX11, libXScrnSaver
+, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver
 , libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false
 }:
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ perl pkgconfig which systemd makeWrapper ];
 
   buildInputs = [
-    cairo dbus gdk_pixbuf glib libX11 libXScrnSaver
+    cairo dbus gdk-pixbuf glib libX11 libXScrnSaver
     libXinerama libnotify pango xorgproto librsvg libXrandr
   ];
 
diff --git a/pkgs/applications/misc/et/default.nix b/pkgs/applications/misc/et/default.nix
index 4aaaa333998..bf1ae3037fc 100644
--- a/pkgs/applications/misc/et/default.nix
+++ b/pkgs/applications/misc/et/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk_pixbuf }:
+{ stdenv, fetchFromGitHub, pkgconfig, libnotify, gdk-pixbuf }:
 
 stdenv.mkDerivation rec {
   name = "et-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "167w9qwfpd63rgy0xmkkkh5krmd91q42c3ijy3j099krgdfbb9bc";
   };
 
-  buildInputs = [ libnotify gdk_pixbuf ];
+  buildInputs = [ libnotify gdk-pixbuf ];
   nativeBuildInputs = [ pkgconfig ];
 
   installPhase = ''
diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix
index c7fcf18e4e3..4746f4ead1b 100644
--- a/pkgs/applications/misc/evilvte/default.nix
+++ b/pkgs/applications/misc/evilvte/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, makeWrapper, pkgconfig,
-  gnome2, glib, pango, cairo, gdk_pixbuf, atk, freetype, xorg,
+  gnome2, glib, pango, cairo, gdk-pixbuf, atk, freetype, xorg,
   configH ? ""
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    gnome2.vte glib pango gnome2.gtk cairo gdk_pixbuf atk freetype xorg.libX11
+    gnome2.vte glib pango gnome2.gtk cairo gdk-pixbuf atk freetype xorg.libX11
     xorg.xorgproto xorg.libXext makeWrapper pkgconfig
   ];
 
diff --git a/pkgs/applications/misc/green-pdfviewer/default.nix b/pkgs/applications/misc/green-pdfviewer/default.nix
index 00421a2e033..cb4f4748eec 100644
--- a/pkgs/applications/misc/green-pdfviewer/default.nix
+++ b/pkgs/applications/misc/green-pdfviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk_pixbuf, SDL, gtk2 }:
+{ stdenv, fetchFromGitHub, poppler, pkgconfig, gdk-pixbuf, SDL, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "green-pdfviewer-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ poppler gdk_pixbuf SDL gtk2 ];
+  buildInputs = [ poppler gdk-pixbuf SDL gtk2 ];
 
   patches = [
     ./gdk-libs.patch
diff --git a/pkgs/applications/misc/hyper/default.nix b/pkgs/applications/misc/hyper/default.nix
index 2fd7e2f94af..f8d808a49c2 100644
--- a/pkgs/applications/misc/hyper/default.nix
+++ b/pkgs/applications/misc/hyper/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk_pixbuf, gnome2, gtk2, cairo
+{ stdenv, lib, fetchurl, dpkg, atk, glib, pango, gdk-pixbuf, gnome2, gtk2, cairo
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
 , libxcb, nss, nspr, alsaLib, cups, expat, udev, libpulseaudio }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
-    stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    stdenv.cc.cc gtk2 gnome2.GConf atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
     libXrender libX11 libXtst libXScrnSaver nss nspr alsaLib cups expat udev libpulseaudio
   ];
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index bc49e810d4e..01aef93e5e5 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeWrapper, pkgconfig
 , zip, python, zlib, which, icu, libmicrohttpd, lzma, aria2, wget, bc
 , libuuid, libX11, libXext, libXt, libXrender, glib, dbus, dbus-glib
-, gtk2, gdk_pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
+, gtk2, gdk-pixbuf, pango, cairo, freetype, fontconfig, alsaLib, atk, cmake
 , xapian, ctpp2, zimlib
 }:
 
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
 
     rm $out/bin/kiwix
     makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
-      --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk_pixbuf pango cairo freetype fontconfig alsaLib atk]} \
+      --suffix LD_LIBRARY_PATH : ${makeLibraryPath [stdenv.cc.cc libX11 libXext libXt libXrender glib dbus dbus-glib gtk2 gdk-pixbuf pango cairo freetype fontconfig alsaLib atk]} \
       --suffix PATH : ${aria2}/bin
   '';
 
diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix
index 0f2274ad259..7ccd4d6e5e9 100644
--- a/pkgs/applications/misc/lutris/default.nix
+++ b/pkgs/applications/misc/lutris/default.nix
@@ -1,6 +1,6 @@
 { buildPythonApplication, lib, fetchFromGitHub
 , wrapGAppsHook, gobject-introspection, gnome-desktop, libnotify, libgnome-keyring, pango
-, gdk_pixbuf, atk, webkitgtk, gst_all_1
+, gdk-pixbuf, atk, webkitgtk, gst_all_1
 , evdev, pyyaml, pygobject3, requests, pillow
 , xrandr, pciutils, psmisc, glxinfo, vulkan-tools, xboxdrv, pulseaudio, p7zip, xgamma
 , libstrangle, wine, fluidsynth, xorgserver
@@ -42,7 +42,7 @@ in buildPythonApplication rec {
 
   buildInputs = [
     wrapGAppsHook gobject-introspection gnome-desktop libnotify libgnome-keyring pango
-    gdk_pixbuf atk webkitgtk
+    gdk-pixbuf atk webkitgtk
   ] ++ gstDeps;
 
   makeWrapperArgs = [
diff --git a/pkgs/applications/misc/mako/default.nix b/pkgs/applications/misc/mako/default.nix
index 32aa15b09e4..afa1ba5e751 100644
--- a/pkgs/applications/misc/mako/default.nix
+++ b/pkgs/applications/misc/mako/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, meson, ninja, pkgconfig, scdoc
-, systemd, pango, cairo, gdk_pixbuf
+, systemd, pango, cairo, gdk-pixbuf
 , wayland, wayland-protocols
 , fetchpatch }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ meson ninja pkgconfig scdoc wayland-protocols ];
-  buildInputs = [ systemd pango cairo gdk_pixbuf wayland ];
+  buildInputs = [ systemd pango cairo gdk-pixbuf wayland ];
 
   mesonFlags = [
     "-Dicons=enabled" "-Dman-pages=enabled" "-Dzsh-completions=true"
diff --git a/pkgs/applications/misc/mlterm/default.nix b/pkgs/applications/misc/mlterm/default.nix
index 2cfa6010853..46ba9d450c8 100644
--- a/pkgs/applications/misc/mlterm/default.nix
+++ b/pkgs/applications/misc/mlterm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, autoconf, makeDesktopItem
-, libX11, gdk_pixbuf, cairo, libXft, gtk3, vte
+, libX11, gdk-pixbuf, cairo, libXft, gtk3, vte
 , harfbuzz #substituting glyphs with opentype fonts
 , fribidi, m17n_lib #bidi and encoding
 , openssl, libssh2 #build-in ssh
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig autoconf ];
   buildInputs = [
-    libX11 gdk_pixbuf.dev cairo libXft gtk3 vte
+    libX11 gdk-pixbuf.dev cairo libXft gtk3 vte
     harfbuzz fribidi m17n_lib openssl libssh2
   ];
 
diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix
index 8dc288c0162..e8497dbc7bd 100644
--- a/pkgs/applications/misc/navit/default.nix
+++ b/pkgs/applications/misc/navit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, gtk2, fontconfig, freetype, imlib2
 , SDL_image, libGLU_combined, libXmu, freeglut, pcre, dbus, dbus-glib, glib
-, librsvg, freeimage, libxslt, cairo, gdk_pixbuf, pango
+, librsvg, freeimage, libxslt, cairo, gdk-pixbuf, pango
 , atk, patchelf, fetchurl, bzip2, python, gettext, quesoglc
 , gd, cmake, shapelib, SDL_ttf, fribidi, makeWrapper
 , qtquickcontrols, qtmultimedia, qtspeech, qtsensors
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     gtk2 fontconfig freetype imlib2 libGLU_combined freeimage
     libxslt libXmu freeglut python gettext quesoglc gd
     fribidi pcre  dbus dbus-glib librsvg shapelib glib
-    cairo gdk_pixbuf pango atk
+    cairo gdk-pixbuf pango atk
   ] ++ optionals sdlSupport [ SDL SDL_ttf SDL_image ]
     ++ optional postgresqlSupport postgresql
     ++ optional speechdSupport speechd
diff --git a/pkgs/applications/misc/plank/default.nix b/pkgs/applications/misc/plank/default.nix
index 8aff573ab83..d5a071fcb54 100644
--- a/pkgs/applications/misc/plank/default.nix
+++ b/pkgs/applications/misc/plank/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, vala, atk, cairo, glib, gnome3, gtk3, libwnck3
 , libX11, libXfixes, libXi, pango, intltool, pkgconfig, libxml2
-, bamf, gdk_pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
+, bamf, gdk-pixbuf, libdbusmenu-gtk3, file, gnome-menus, libgee
 , wrapGAppsHook, autoreconfHook, pantheon }:
 
 stdenv.mkDerivation rec {
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     atk
     bamf
     cairo
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gnome-menus
     gnome3.dconf
diff --git a/pkgs/applications/misc/polar-bookshelf/default.nix b/pkgs/applications/misc/polar-bookshelf/default.nix
index 11c643fac2c..81e3d80f516 100644
--- a/pkgs/applications/misc/polar-bookshelf/default.nix
+++ b/pkgs/applications/misc/polar-bookshelf/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, makeWrapper, fetchurl
 , dpkg, wrapGAppsHook, autoPatchelfHook
-, gtk3, cairo, gnome2, atk, gdk_pixbuf, glib
+, gtk3, cairo, gnome2, atk, gdk-pixbuf, glib
 , at-spi2-atk, dbus, libX11, libxcb, libXi
 , libXcursor, libXdamage, libXrandr, libXcomposite
 , libXext, libXfixes, libXrender, libXtst, libXScrnSaver
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     cairo
     gnome2.pango
     atk
-    gdk_pixbuf
+    gdk-pixbuf
     at-spi2-atk
     dbus
     libX11
@@ -48,10 +48,10 @@ stdenv.mkDerivation rec {
     expat
   ];
 
-  nativeBuildInputs = [ 
+  nativeBuildInputs = [
     wrapGAppsHook
     autoPatchelfHook
-    makeWrapper 
+    makeWrapper
     dpkg
   ];
 
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     mv usr/share/* $out/share/
 
     ln -s $out/share/polar-bookshelf/polar-bookshelf $out/bin/polar-bookshelf
-    
+
     # Correct desktop file `Exec`
     substituteInPlace $out/share/applications/polar-bookshelf.desktop \
       --replace "/opt/Polar Bookshelf/polar-bookshelf" "$out/bin/polar-bookshelf"
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 11a75e4064f..aa0ebc29a55 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, docbook_xsl, dbus, dbus-glib, expat
-, gsettings-desktop-schemas, gdk_pixbuf, gtk3, hicolor-icon-theme
+, gsettings-desktop-schemas, gdk-pixbuf, gtk3, hicolor-icon-theme
 , imagemagick, itstool, librsvg, libtool, libxslt, makeWrapper
 , pkgconfig, python, pythonPackages, vte
 , wrapGAppsHook}:
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
   buildInputs =
     [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
       makeWrapper python pythonPackages.lockfile dbus dbus-glib
-      gdk_pixbuf gsettings-desktop-schemas gtk3
+      gdk-pixbuf gsettings-desktop-schemas gtk3
       hicolor-icon-theme vte ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus-glib.dev}/include/dbus-1.0"
diff --git a/pkgs/applications/misc/rxvt_unicode/default.nix b/pkgs/applications/misc/rxvt_unicode/default.nix
index d198c595135..053eaf6e54c 100644
--- a/pkgs/applications/misc/rxvt_unicode/default.nix
+++ b/pkgs/applications/misc/rxvt_unicode/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeDesktopItem, perlSupport ? true, libX11, libXt, libXft,
   ncurses, perl, fontconfig, freetype, pkgconfig, libXrender,
-  gdkPixbufSupport ? true, gdk_pixbuf, unicode3Support ? true }:
+  gdkPixbufSupport ? true, gdk-pixbuf, unicode3Support ? true }:
 
 let
   pname = "rxvt-unicode";
@@ -31,7 +31,7 @@ stdenv.mkDerivation (rec {
     [ libX11 libXt libXft ncurses /* required to build the terminfo file */
       fontconfig freetype pkgconfig libXrender ]
     ++ stdenv.lib.optional perlSupport perl
-    ++ stdenv.lib.optional gdkPixbufSupport gdk_pixbuf;
+    ++ stdenv.lib.optional gdkPixbufSupport gdk-pixbuf;
 
   outputs = [ "out" "terminfo" ];
 
diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix
index de1e7a093d5..30f54cdee7e 100644
--- a/pkgs/applications/misc/safeeyes/default.nix
+++ b/pkgs/applications/misc/safeeyes/default.nix
@@ -1,4 +1,4 @@
-{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk_pixbuf, shared-mime-info, librsvg
+{ lib, python3Packages, gobject-introspection, libappindicator-gtk3, libnotify, gtk3, gnome3, xprintidle-ng, wrapGAppsHook, gdk-pixbuf, shared-mime-info, librsvg
 }:
 
 let inherit (python3Packages) python buildPythonApplication fetchPypi;
@@ -50,7 +50,7 @@ in buildPythonApplication rec {
 
   preFixup = ''
     gappsWrapperArgs+=(
-      --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
+      --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
       --prefix XDG_DATA_DIRS : "${librsvg}/share"
 
diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix
index 719b8d32b33..6a16741a06b 100644
--- a/pkgs/applications/misc/simplenote/default.nix
+++ b/pkgs/applications/misc/simplenote/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, lib, zlib, glib, alsaLib, dbus, gtk2, atk, pango, freetype, fontconfig
-, libgnome-keyring3, gdk_pixbuf, cairo, cups, expat, libgpgerror, nspr
+, libgnome-keyring3, gdk-pixbuf, cairo, cups, expat, libgpgerror, nspr
 , nss, xorg, libcap, systemd, libnotify ,libXScrnSaver, gnome2 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
     packages = [
       stdenv.cc.cc zlib glib dbus gtk2 atk pango freetype libgnome-keyring3
-      fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr nss
+      fontconfig gdk-pixbuf cairo cups expat libgpgerror alsaLib nspr nss
       xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
       xorg.libXcomposite xorg.libXi xorg.libXfixes xorg.libXrandr
       xorg.libXcursor libcap systemd libnotify libXScrnSaver gnome2.GConf
diff --git a/pkgs/applications/misc/stretchly/default.nix b/pkgs/applications/misc/stretchly/default.nix
index 8f26ee99e22..213f308646a 100644
--- a/pkgs/applications/misc/stretchly/default.nix
+++ b/pkgs/applications/misc/stretchly/default.nix
@@ -8,7 +8,7 @@
 , expat
 , fetchurl
 , fontconfig
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , gtk2
 , gtk3
@@ -51,7 +51,7 @@ let
     dbus
     expat
     fontconfig
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gtk2
     gtk3
diff --git a/pkgs/applications/misc/terminus/default.nix b/pkgs/applications/misc/terminus/default.nix
index c12a4c9f8da..8518b72bc95 100644
--- a/pkgs/applications/misc/terminus/default.nix
+++ b/pkgs/applications/misc/terminus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk_pixbuf, cairo
+{ stdenv, lib, fetchurl, dpkg, gnome2, gtk2, atk, glib, pango, gdk-pixbuf, cairo
 , freetype, fontconfig, dbus, libXi, libXcursor, libXdamage, libXrandr
 , libXcomposite, libXext, libXfixes, libXrender, libX11, libXtst, libXScrnSaver
 , libxcb, makeWrapper, nodejs
@@ -6,7 +6,7 @@
 
 let
   libPath = stdenv.lib.makeLibraryPath [
-    stdenv.cc.cc gtk2 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    stdenv.cc.cc gtk2 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes libxcb
     libXrender libX11 libXtst libXScrnSaver gnome2.GConf nss nspr alsaLib cups expat systemd libpulseaudio
   ];
diff --git a/pkgs/applications/misc/volnoti/default.nix b/pkgs/applications/misc/volnoti/default.nix
index 166811fb4ae..47b0385be68 100644
--- a/pkgs/applications/misc/volnoti/default.nix
+++ b/pkgs/applications/misc/volnoti/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchpatch
-, pkgconfig, dbus, gdk_pixbuf, glib, libX11, gtk2, librsvg
+, pkgconfig, dbus, gdk-pixbuf, glib, libX11, gtk2, librsvg
 , dbus-glib, autoreconfHook, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoreconfHook wrapGAppsHook ];
 
   buildInputs = [
-    dbus gdk_pixbuf glib libX11 gtk2 dbus-glib librsvg
+    dbus gdk-pixbuf glib libX11 gtk2 dbus-glib librsvg
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/xneur/default.nix b/pkgs/applications/misc/xneur/default.nix
index c6438a21f2c..1cce7b155fd 100644
--- a/pkgs/applications/misc/xneur/default.nix
+++ b/pkgs/applications/misc/xneur/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, xorg, pcre, gst_all_1, glib
-, xosd, libnotify, enchant, wrapGAppsHook, gdk_pixbuf }:
+, xosd, libnotify, enchant, wrapGAppsHook, gdk-pixbuf }:
 
 stdenv.mkDerivation rec {
    name = "xneur-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     xorg.libX11 xorg.libXtst pcre gst_all_1.gstreamer glib
     xosd xorg.libXext xorg.libXi libnotify
-    enchant gdk_pixbuf
+    enchant gdk-pixbuf
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
   ];
 
diff --git a/pkgs/applications/misc/xxkb/default.nix b/pkgs/applications/misc/xxkb/default.nix
index 56638d126c1..db952758f04 100644
--- a/pkgs/applications/misc/xxkb/default.nix
+++ b/pkgs/applications/misc/xxkb/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, libX11, libXt, libXext, libXpm, imake, gccmakedep
-, svgSupport ? false, librsvg, glib, gdk_pixbuf, pkgconfig
+, svgSupport ? false, librsvg, glib, gdk-pixbuf, pkgconfig
 }:
 
 assert svgSupport ->
-  librsvg != null && glib != null && gdk_pixbuf != null && pkgconfig != null;
+  librsvg != null && glib != null && gdk-pixbuf != null && pkgconfig != null;
 
 stdenv.mkDerivation rec {
   name = "xxkb-1.11.1";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ imake gccmakedep ];
   buildInputs = [
     libX11 libXt libXext libXpm
-  ] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk_pixbuf pkgconfig ];
+  ] ++ stdenv.lib.optionals svgSupport [ librsvg glib gdk-pixbuf pkgconfig ];
 
   outputs = [ "out" "man" ];
 
diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index 4a6af3f96b4..3603e1605f9 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -10,7 +10,7 @@
 , expat
 , fontconfig
 , freetype
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , gnome2
 , gnome3
@@ -52,7 +52,7 @@ rpath = lib.makeLibraryPath [
   expat
   fontconfig
   freetype
-  gdk_pixbuf
+  gdk-pixbuf
   glib
   gnome2.GConf
   gtk3
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index c52bf0ba95e..2f79f6900cd 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -9,7 +9,7 @@
 , fontconfig
 , freetype
 , gconf
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , glibc
 , gtk2
@@ -104,7 +104,7 @@ stdenv.mkDerivation {
       fontconfig
       freetype
       gconf
-      gdk_pixbuf
+      gdk-pixbuf
       glib
       glibc
       gtk2
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index b0ae61c761d..977b40e4a7e 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -4,7 +4,7 @@
 , glib, fontconfig, freetype, pango, cairo, libX11, libXi, atk, gconf, nss, nspr
 , libXcursor, libXext, libXfixes, libXrender, libXScrnSaver, libXcomposite, libxcb
 , alsaLib, libXdamage, libXtst, libXrandr, expat, cups
-, dbus, gtk2, gtk3, gdk_pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
+, dbus, gtk2, gtk3, gdk-pixbuf, gcc-unwrapped, at-spi2-atk, at-spi2-core
 , kerberos
 
 # command line arguments which are always set e.g "--disable-gpu"
@@ -52,7 +52,7 @@ let
     glib fontconfig freetype pango cairo libX11 libXi atk gconf nss nspr
     libXcursor libXext libXfixes libXrender libXScrnSaver libXcomposite libxcb
     alsaLib libXdamage libXtst libXrandr expat cups
-    dbus gdk_pixbuf gcc-unwrapped.lib
+    dbus gdk-pixbuf gcc-unwrapped.lib
     systemd
     libexif
     liberation_ttf curl utillinux xdg_utils wget
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
index fa98f2a9e78..32e4366a4e4 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/bluejeans/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xorg, gtk2, glib, gdk_pixbuf, dpkg, libXext, libXfixes
+{ stdenv, fetchurl, xorg, gtk2, glib, gdk-pixbuf, dpkg, libXext, libXfixes
 , libXrender, libuuid, libXrandr, libXcomposite, libpulseaudio
 }:
 
@@ -10,7 +10,7 @@ let
     [gtk2 glib stdenv.cc.cc];
 
   rpathPlugin = makeLibraryPath
-    ([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk_pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid);
+    ([ stdenv.cc.cc gtk2 glib xorg.libX11 gdk-pixbuf libXext libXfixes libXrender libXrandr libXcomposite libpulseaudio ] ++ optional (libuuid != null) libuuid);
 
 in
 
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
index b4d0b91deac..8aa51366e47 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/default.nix
@@ -9,7 +9,7 @@
 , expat
 , fontconfig
 , freetype
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , glibc
 , graphite2
@@ -130,7 +130,7 @@ stdenv.mkDerivation rec {
 
   rpath = lib.makeLibraryPath
     [ stdenv.cc.cc
-      alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib
+      alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib
       glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
       libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
       libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
index 585c0be26d1..c9081ee3d69 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer/standalone.nix
@@ -9,7 +9,7 @@
 , expat
 , fontconfig
 , freetype
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , glibc
 , graphite2
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
 
   rpath = lib.makeLibraryPath
     [ stdenv.cc.cc
-      alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk_pixbuf glib
+      alsaLib atk bzip2 cairo curl expat fontconfig freetype gdk-pixbuf glib
       glibc graphite2 gtk2 harfbuzz libICE libSM libX11 libXau libXcomposite
       libXcursor libXdamage libXdmcp libXext libXfixes libXi libXinerama
       libXrandr libXrender libXt libXxf86vm libdrm libffi libglvnd libpng
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 71b5161c1e3..8a25036c70a 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libGL, xorg, cairo
-, libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl
+, libpng, gtk2, glib, gdk-pixbuf, fontconfig, freetype, curl
 , dbus-glib, alsaLib, libpulseaudio, systemd, pango
 }:
 
@@ -24,7 +24,7 @@ let
     ];
 
   rpathProgram = makeLibraryPath
-    [ gdk_pixbuf
+    [ gdk-pixbuf
       glib
       gtk2
       xorg.libX11
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 732e020604a..062d2e6582b 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -9,7 +9,7 @@
 , fetchurl
 , fontconfig
 , freetype
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , gnome2
 , gtk3
@@ -55,7 +55,7 @@ let
     expat.out
     fontconfig.lib
     freetype.out
-    gdk_pixbuf.out
+    gdk-pixbuf.out
     glib.out
     gnome2.GConf
     gtk3.out
diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
index 4eeb6582672..6632b116fc3 100644
--- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
+++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix
@@ -12,7 +12,7 @@
 , dbus-glib
 , fontconfig
 , freetype
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , gtk3
 , libxcb
@@ -67,7 +67,7 @@ let
     dbus-glib
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gtk3
     libxcb
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 4b0071bfabc..2367c0a9855 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -4,7 +4,7 @@
 , freetype, fontconfig, libXft, libXrender, libxcb, expat
 , libuuid
 , gstreamer, gst-plugins-base, libxml2
-, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2
+, glib, gtk3, pango, gdk-pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2
 , nss, nspr
 , patchelf, makeWrapper
 , isSnapshot ? false
@@ -34,7 +34,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
     libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
-    atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
+    atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk-pixbuf libexif ffmpeg systemd
     freetype fontconfig libXrender libuuid expat glib nss nspr
     gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf
   ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;
diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix
index 2b6645b2c8a..ae0643669dc 100644
--- a/pkgs/applications/networking/dropbox/cli.nix
+++ b/pkgs/applications/networking/dropbox/cli.nix
@@ -6,7 +6,7 @@
 , dropbox
 , gtk3
 , gnome3
-, gdk_pixbuf
+, gdk-pixbuf
 , gobject-introspection
 }:
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     pkgconfig
     gobject-introspection
-    gdk_pixbuf
+    gdk-pixbuf
     # only for build, the install command also wants to use GTK through introspection
     # but we are using Nix for installation so we will not need that.
     (python3.withPackages (ps: with ps; [
diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index a2ba2f09f76..fb38255ea38 100644
--- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, rpmextract, patchelf, libnotify, libcap, cairo, pango, fontconfig, udev, dbus
-, gtk2, atk, expat, gdk_pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage
+, gtk2, atk, expat, gdk-pixbuf, freetype, nspr, glib, nss, gconf, libX11, libXrender, libXtst, libXdamage
 , libXi, libXext, libXfixes, libXcomposite, alsaLib, bash
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   libPath =
     stdenv.lib.makeLibraryPath
-       [ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk_pixbuf dbus udev.lib
+       [ libnotify libcap cairo pango fontconfig gtk2 atk expat gdk-pixbuf dbus udev.lib
          freetype nspr glib stdenv.cc stdenv.cc.cc.lib nss gconf libX11 libXrender libXtst libXdamage
          libXi libXext libXfixes libXcomposite alsaLib
        ];
diff --git a/pkgs/applications/networking/instant-messengers/coyim/default.nix b/pkgs/applications/networking/instant-messengers/coyim/default.nix
index e2e94db089d..fb47d8db8c8 100644
--- a/pkgs/applications/networking/instant-messengers/coyim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/coyim/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildGoPackage, fetchFromGitHub, pkgconfig,
-  cairo, gdk_pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
+  cairo, gdk-pixbuf, glib, gnome3, wrapGAppsHook, gtk3 }:
 
 buildGoPackage rec {
   name = "coyim-${version}";
@@ -14,7 +14,7 @@ buildGoPackage rec {
     sha256 = "1g8nf56j17rdhhj7pv3ha1rb2mfc0mdvyzl35pgcki08w7iw08j3";
   };
 
-  nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk_pixbuf gtk3 gnome3.adwaita-icon-theme ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook glib cairo gdk-pixbuf gtk3 gnome3.adwaita-icon-theme ];
 
   meta = with stdenv.lib; {
     description = "a safe and secure chat client";
diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 7c2b312c4b3..2158409471f 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , vala, cmake, ninja, wrapGAppsHook, pkgconfig, gettext
-, gobject-introspection, gnome3, glib, gdk_pixbuf, gtk3, glib-networking
+, gobject-introspection, gnome3, glib, gdk-pixbuf, gtk3, glib-networking
 , xorg, libXdmcp, libxkbcommon
 , libnotify, libsoup, libgee
 , libgcrypt
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     libgee
     gnome3.adwaita-icon-theme
     sqlite
-    gdk_pixbuf
+    gdk-pixbuf
     gtk3
     libnotify
     gpgme
diff --git a/pkgs/applications/networking/instant-messengers/discord/base.nix b/pkgs/applications/networking/instant-messengers/discord/base.nix
index 17f6f477374..4dadcb6ce23 100644
--- a/pkgs/applications/networking/instant-messengers/discord/base.nix
+++ b/pkgs/applications/networking/instant-messengers/discord/base.nix
@@ -1,7 +1,7 @@
 { pname, version, src, binaryName, desktopName
 , stdenv, fetchurl, makeDesktopItem, wrapGAppsHook
 , alsaLib, atk, at-spi2-atk, at-spi2-core, cairo, cups, dbus, expat, fontconfig, freetype
-, gdk_pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
+, gdk-pixbuf, glib, gtk3, libnotify, libX11, libXcomposite, libXcursor, libXdamage, libuuid
 , libXext, libXfixes, libXi, libXrandr, libXrender, libXtst, nspr, nss, libxcb
 , pango, systemd, libXScrnSaver, libcxx, libpulseaudio }:
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
   libPath = stdenv.lib.makeLibraryPath [
     libcxx systemd libpulseaudio
     stdenv.cc.cc alsaLib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype
-    gdk_pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
+    gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid
     libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender
     libXtst nspr nss libxcb pango systemd libXScrnSaver
    ];
diff --git a/pkgs/applications/networking/instant-messengers/franz/default.nix b/pkgs/applications/networking/instant-messengers/franz/default.nix
index 63624146aeb..9db5f30033d 100644
--- a/pkgs/applications/networking/instant-messengers/franz/default.nix
+++ b/pkgs/applications/networking/instant-messengers/franz/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, wrapGAppsHook, autoPatchelfHook, dpkg
-, xorg, atk, glib, pango, gdk_pixbuf, cairo, freetype, fontconfig, gtk3
+, xorg, atk, glib, pango, gdk-pixbuf, cairo, freetype, fontconfig, gtk3
 , gnome2, dbus, nss, nspr, alsaLib, cups, expat, udev, libnotify, xdg_utils }:
 
 let
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
     libXi libXcursor libXdamage libXrandr libXcomposite libXext libXfixes
     libXrender libX11 libXtst libXScrnSaver
   ]) ++ [
-    gtk3 atk glib pango gdk_pixbuf cairo freetype fontconfig dbus
+    gtk3 atk glib pango gdk-pixbuf cairo freetype fontconfig dbus
     gnome2.GConf nss nspr alsaLib cups expat stdenv.cc.cc
   ];
   runtimeDependencies = [ udev.lib libnotify ];
diff --git a/pkgs/applications/networking/instant-messengers/gitter/default.nix b/pkgs/applications/networking/instant-messengers/gitter/default.nix
index 5b664415c1f..6878c9a870b 100644
--- a/pkgs/applications/networking/instant-messengers/gitter/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gitter/default.nix
@@ -1,5 +1,5 @@
 { stdenv, alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl
-, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk3, libX11
+, fontconfig, freetype, gdk-pixbuf, glib, gnome2, gtk3, libX11
 , libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes
 , libXi, libXrandr, libXrender, libXtst, libappindicator-gtk3, libcxx
 , libnotify, libpulseaudio, libxcb, makeDesktopItem, makeWrapper, nspr, nss
@@ -12,7 +12,7 @@ let gitterDirectorySuffix = "opt/gitter";
          $out/${gitterDirectorySuffix}/${target}
        '';
    libPath = stdenv.lib.makeLibraryPath [
-     alsaLib atk cairo cups dbus expat fontconfig freetype gdk_pixbuf glib
+     alsaLib atk cairo cups dbus expat fontconfig freetype gdk-pixbuf glib
      gnome2.GConf gtk3 libX11 libXScrnSaver libXcomposite libXcursor libXdamage
      libXext libXfixes libXi libXrandr libXrender libXtst libappindicator-gtk3
      libcxx libnotify libpulseaudio libxcb nspr nss pango stdenv.cc.cc systemd
diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix
index 4282e99a712..67d5e56a021 100644
--- a/pkgs/applications/networking/instant-messengers/linphone/default.nix
+++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix
@@ -2,7 +2,7 @@
 , zlib, libxml2, gtk2, libnotify, speex, ffmpeg, libX11, libsoup, udev
 , ortp, mediastreamer, sqlite, belle-sip, libosip, libexosip, bzrtp
 , mediastreamer-openh264, bctoolbox, makeWrapper, fetchFromGitHub, cmake
-, libmatroska, bcunit, doxygen, gdk_pixbuf, glib, cairo, pango, polarssl
+, libmatroska, bcunit, doxygen, gdk-pixbuf, glib, cairo, pango, polarssl
 , python, graphviz, belcard
 , withGui ? true
 }:
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     readline openldap cyrus_sasl libupnp zlib libxml2 gtk2 libnotify speex ffmpeg libX11
     polarssl libsoup udev ortp mediastreamer sqlite belle-sip libosip libexosip
-    bctoolbox libmatroska bcunit gdk_pixbuf glib cairo pango bzrtp belcard
+    bctoolbox libmatroska bcunit gdk-pixbuf glib cairo pango bzrtp belcard
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
index e8c28dc3e53..1fb74314811 100644
--- a/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mattermost-desktop/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk_pixbuf, glib,
+{ stdenv, fetchurl, gnome2, gtk3, pango, atk, cairo, gdk-pixbuf, glib,
 freetype, fontconfig, dbus, libX11, xorg, libXi, libXcursor, libXdamage,
 libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst,
 libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev }:
@@ -12,7 +12,7 @@ let
     expat
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gnome2.GConf
     gtk3
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
index ddb9217d5e2..6657ff96b11 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/skype4pidgin/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk_pixbuf, glib, dbus
+{ stdenv, fetchurl, pkgconfig, pidgin, libnotify, gdk-pixbuf, glib, dbus
 , dbus-glib }:
 
 stdenv.mkDerivation rec {
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ pidgin libnotify gdk_pixbuf glib dbus dbus-glib ];
+  buildInputs = [ pidgin libnotify gdk-pixbuf glib dbus dbus-glib ];
 
   meta = {
     homepage = https://github.com/novas0x2a/skype4pidgin;
diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 1273c7dd3c3..fbbf6204971 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -4,14 +4,14 @@
 , autoconf-archive
 
 , autoAwaySupport ? true,       libXScrnSaver ? null, libX11 ? null
-, notifySupport ? true,         libnotify ? null, gdk_pixbuf ? null
+, notifySupport ? true,         libnotify ? null, gdk-pixbuf ? null
 , traySupport ? true,           gnome2 ? null
 , pgpSupport ? true,            gpgme ? null
 , pythonPluginSupport ? true,   python ? null
 }:
 
 assert autoAwaySupport     -> libXScrnSaver != null && libX11 != null;
-assert notifySupport       -> libnotify != null && gdk_pixbuf != null;
+assert notifySupport       -> libnotify != null && gdk-pixbuf != null;
 assert traySupport         -> gnome2 != null;
 assert pgpSupport          -> gpgme != null;
 assert pythonPluginSupport -> python != null;
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     expect readline libuuid glib openssl expat ncurses libotr
     curl libmesode cmocka libmicrohttpd stabber
   ] ++ optionals autoAwaySupport     [ libXScrnSaver libX11 ]
-    ++ optionals notifySupport       [ libnotify gdk_pixbuf ]
+    ++ optionals notifySupport       [ libnotify gdk-pixbuf ]
     ++ optionals traySupport         [ gnome2.gtk ]
     ++ optionals pgpSupport          [ gpgme ]
     ++ optionals pythonPluginSupport [ python ];
diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
index e0cb977d5c2..fa72d234ce9 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, dpkg, wrapGAppsHook
-, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk_pixbuf, glib, freetype, fontconfig
+, gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig
 , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite
 , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib
 , cups, expat, udev, libnotify, libuuid
@@ -31,7 +31,7 @@ let
     expat
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gnome2.GConf
     gtk3
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 8a732de08ce..59db08a35ac 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dpkg
-, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3
+, alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, glibc, gnome2, gnome3
 , gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg
 , at-spi2-atk }:
 
@@ -25,7 +25,7 @@ let
     libsecret
 
     gnome2.GConf
-    gdk_pixbuf
+    gdk-pixbuf
     gtk3
 
     gnome3.gnome-keyring
diff --git a/pkgs/applications/networking/instant-messengers/slack/default.nix b/pkgs/applications/networking/instant-messengers/slack/default.nix
index 309b09f10c4..8b74cbc4d93 100644
--- a/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/slack/default.nix
@@ -1,5 +1,5 @@
 { theme ? null, stdenv, fetchurl, dpkg, makeWrapper , alsaLib, atk, cairo,
-cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk_pixbuf,
+cups, curl, dbus, expat, fontconfig, freetype, glib , gnome2, gtk3, gdk-pixbuf,
 libappindicator-gtk3, libnotify, libxcb, nspr, nss, pango , systemd, xorg,
 at-spi2-atk, libuuid
 }:
@@ -21,7 +21,7 @@ let
     freetype
     glib
     gnome2.GConf
-    gdk_pixbuf
+    gdk-pixbuf
     gtk3
     pango
     libnotify
diff --git a/pkgs/applications/networking/instant-messengers/stride/default.nix b/pkgs/applications/networking/instant-messengers/stride/default.nix
index 9df816dd890..17a38479f82 100644
--- a/pkgs/applications/networking/instant-messengers/stride/default.nix
+++ b/pkgs/applications/networking/instant-messengers/stride/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dpkg, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
-, freetype, gdk_pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
+, freetype, gdk-pixbuf, glib, gnome2, nspr, nss, pango, udev, xorg }:
 let
   fullPath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -10,7 +10,7 @@ let
     expat
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gnome2.GConf
     gnome2.gtk
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index c4acb22c810..95879fef05a 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, libsodium, ncurses, curl
 , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus
-, qrencode, gdk_pixbuf, libnotify }:
+, qrencode, gdk-pixbuf, libnotify }:
 
 stdenv.mkDerivation rec {
   name = "toxic-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "PREFIX=$(out)"];
 
   buildInputs = [
-    libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
+    libtoxcore libsodium ncurses curl gdk-pixbuf libnotify
   ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
     openal libopus libvpx freealut qrencode
   ];
diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index f2ae27e2c7d..fb8a24be70d 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, dpkg, makeDesktopItem, libuuid, gtk3, atk, cairo, pango
-, gdk_pixbuf, glib, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi
+, gdk-pixbuf, glib, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi
 , libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes
 , libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev
 , xdg_utils, hunspell, pulseaudio, pciutils, at-spi2-atk
@@ -16,7 +16,7 @@ let
     expat
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gtk3
     at-spi2-atk
diff --git a/pkgs/applications/networking/mailreaders/inboxer/default.nix b/pkgs/applications/networking/mailreaders/inboxer/default.nix
index 72b9ce09d76..4139b650fb7 100644
--- a/pkgs/applications/networking/mailreaders/inboxer/default.nix
+++ b/pkgs/applications/networking/mailreaders/inboxer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, binutils, patchelf, makeWrapper
-, expat, xorg, gdk_pixbuf, glib, gnome2, cairo, atk, freetype
+, expat, xorg, gdk-pixbuf, glib, gnome2, cairo, atk, freetype
 , fontconfig, dbus, nss, nspr, gtk2-x11, alsaLib, cups, libpulseaudio, udev }:
 
 stdenv.mkDerivation rec {
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       xorg.libXtst
       xorg.libXScrnSaver
       xorg.libxcb
-      gdk_pixbuf
+      gdk-pixbuf
       glib
       gnome2.pango
       gnome2.GConf
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 32455e1132f..d8151340662 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, gettext, gtk3, pythonPackages
-, gdk_pixbuf, libnotify, gst_all_1
+, gdk-pixbuf, libnotify, gst_all_1
 , libgnome-keyring3
 , wrapGAppsHook, gnome3
 # otherwise passwords are stored unencrypted
@@ -18,7 +18,7 @@ in pythonPackages.buildPythonApplication rec {
   };
 
   buildInputs = [
-    gtk3 gdk_pixbuf libnotify gst_all_1.gstreamer
+    gtk3 gdk-pixbuf libnotify gst_all_1.gstreamer
     gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
     gst_all_1.gst-plugins-bad
     gnome3.adwaita-icon-theme
diff --git a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
index 3d8673a87a1..5bb24c9ded7 100644
--- a/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/nylas-mail-bin/default.nix
@@ -10,7 +10,7 @@
 , fontconfig
 , freetype
 , gcc-unwrapped
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , gnome2
 , libgnome-keyring
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     fontconfig
     freetype
     gcc-unwrapped
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gnome2.GConf
     gnome2.gtk
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index 08823364479..5e005cd6669 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -10,7 +10,7 @@
 , dbus
 , fontconfig
 , freetype
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , glibc
 , gst-plugins-base
@@ -90,7 +90,7 @@ stdenv.mkDerivation {
       dbus
       fontconfig
       freetype
-      gdk_pixbuf
+      gdk-pixbuf
       glib
       glibc
       gst-plugins-base
diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix
index 2d5f47ee982..2cbf83c16ae 100644
--- a/pkgs/applications/networking/mullvad-vpn/default.nix
+++ b/pkgs/applications/networking/mullvad-vpn/default.nix
@@ -1,6 +1,6 @@
 { stdenv, makeWrapper, fetchurl, dpkg
 , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
-, gdk_pixbuf, glib, gnome2, pango, nspr, nss, gtk3
+, gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3
 , xorg, autoPatchelfHook, systemd, libnotify
 }:
 
@@ -13,7 +13,7 @@ let deps = [
     expat
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gnome2.GConf
     pango
diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix
index 7a5f389af24..ea8b5c3a11f 100644
--- a/pkgs/applications/networking/p2p/tixati/default.nix
+++ b/pkgs/applications/networking/p2p/tixati/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk_pixbuf, cairo, pango }:
+{ stdenv, fetchurl, glib, zlib, dbus, dbus-glib, gtk2, gdk-pixbuf, cairo, pango }:
 
 stdenv.mkDerivation rec {
   name = "tixati-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   installPhase = ''
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-             --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk_pixbuf cairo pango ]} \
+             --set-rpath ${stdenv.lib.makeLibraryPath [ glib zlib dbus dbus-glib gtk2 gdk-pixbuf cairo pango ]} \
              tixati
     install -D tixati         $out/bin/tixati
     install -D tixati.desktop $out/share/applications/tixati.desktop
diff --git a/pkgs/applications/networking/p2p/transgui/default.nix b/pkgs/applications/networking/p2p/transgui/default.nix
index d4823988526..7c720cf35a0 100644
--- a/pkgs/applications/networking/p2p/transgui/default.nix
+++ b/pkgs/applications/networking/p2p/transgui/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, makeDesktopItem, unzip, fpc, lazarus,
-libX11, glib, gtk2, gdk_pixbuf, pango, atk, cairo, openssl }:
+libX11, glib, gtk2, gdk-pixbuf, pango, atk, cairo, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "transgui";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     unzip fpc lazarus stdenv.cc
-    libX11 glib gtk2 gdk_pixbuf pango atk cairo openssl
+    libX11 glib gtk2 gdk-pixbuf pango atk cairo openssl
   ];
 
   NIX_LDFLAGS = "
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     "INSTALL_PREFIX=$(out)"
   ];
 
-  LCL_PLATFORM = "gtk2"; 
+  LCL_PLATFORM = "gtk2";
 
   desktopItem = makeDesktopItem rec {
     name = "transgui";
@@ -63,10 +63,10 @@ stdenv.mkDerivation rec {
     mkdir -p "$out/share/icons/hicolor/48x48/apps"
     cp transgui.png "$out/share/icons/hicolor/48x48/apps"
     mkdir -p "$out/share/transgui"
-    cp -r "./lang" "$out/share/transgui" 
+    cp -r "./lang" "$out/share/transgui"
   '';
 
-  meta = { 
+  meta = {
     description = "A cross platform front-end for the Transmission Bit-Torrent client";
     homepage = https://sourceforge.net/p/transgui;
     license = stdenv.lib.licenses.gpl2Plus;
diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix
index a9b358fc793..66edc203276 100644
--- a/pkgs/applications/networking/remote/anydesk/default.nix
+++ b/pkgs/applications/networking/remote/anydesk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, makeDesktopItem
-, atk, cairo, gdk_pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
+, atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU_combined, pango, xorg
 , lsb-release, freetype, fontconfig, pangox_compat, polkit, polkit_gnome }:
 
 let
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    atk cairo gdk_pixbuf glib gtk2 stdenv.cc.cc pango
+    atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango
     gnome2.gtkglext libGLU_combined freetype fontconfig
     pangox_compat polkit polkit_gnome
   ] ++ (with xorg; [
diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index d6e25ae4e7b..1f70cb56b54 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -12,7 +12,7 @@
 , glib
 , gtk2
 , atk
-, gdk_pixbuf
+, gdk-pixbuf
 , cairo
 , pango
 , gnome3
@@ -100,14 +100,14 @@ let
         busybox
         file
         gtk2
-        gdk_pixbuf
+        gdk-pixbuf
       ];
 
       libPath = stdenv.lib.makeLibraryPath [
         glib
         gtk2
         atk
-        gdk_pixbuf
+        gdk-pixbuf
         cairo
         pango
         gnome3.dconf
diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix
index 13a16a6e224..4598903d201 100644
--- a/pkgs/applications/networking/remote/citrix-workspace/default.nix
+++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix
@@ -12,7 +12,7 @@
 , glib
 , gtk2
 , atk
-, gdk_pixbuf
+, gdk-pixbuf
 , cairo
 , pango
 , gnome3
@@ -100,14 +100,14 @@ let
         busybox
         file
         gtk2
-        gdk_pixbuf
+        gdk-pixbuf
       ];
 
       libPath = stdenv.lib.makeLibraryPath [
         glib
         gtk2
         atk
-        gdk_pixbuf
+        gdk-pixbuf
         cairo
         pango
         gnome3.dconf
diff --git a/pkgs/applications/networking/ssb/patchwork-classic/default.nix b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
index 1f8d0cba6d0..706dd670324 100644
--- a/pkgs/applications/networking/ssb/patchwork-classic/default.nix
+++ b/pkgs/applications/networking/ssb/patchwork-classic/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, lib, makeWrapper,
   # build dependencies
   alsaLib, atk, cairo, cups, dbus, expat, fontconfig,
-  freetype, gdk_pixbuf, glib, gnome2, nspr, nss, xorg,
+  freetype, gdk-pixbuf, glib, gnome2, nspr, nss, xorg,
   glibc, systemd
 }:
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
       expat
       fontconfig
       freetype
-      gdk_pixbuf
+      gdk-pixbuf
       glib
       gnome2.GConf
       gnome2.gtk
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Electron wrapper for Patchwork Classic: run as a desktop app outside the browser";
     homepage    = "https://github.com/ssbc/patchwork-classic-electron";
-    license     = licenses.gpl3; 
+    license     = licenses.gpl3;
     maintainers = with maintainers; [ mrVanDalo ];
     platforms   = platforms.linux;
   };
diff --git a/pkgs/applications/networking/super-productivity/default.nix b/pkgs/applications/networking/super-productivity/default.nix
index 9bb4254c64a..3f87c8558e1 100644
--- a/pkgs/applications/networking/super-productivity/default.nix
+++ b/pkgs/applications/networking/super-productivity/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, dpkg, makeWrapper
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, glib
-, gnome2, gtk3, gdk_pixbuf, libnotify, libxcb, nspr, nss, pango
+, gnome2, gtk3, gdk-pixbuf, libnotify, libxcb, nspr, nss, pango
 , systemd, xorg, xprintidle-ng }:
 
 let
@@ -19,7 +19,7 @@ let
     freetype
     glib
     gnome2.GConf
-    gdk_pixbuf
+    gdk-pixbuf
     gtk3
     pango
     libnotify
diff --git a/pkgs/applications/office/moneyplex/default.nix b/pkgs/applications/office/moneyplex/default.nix
index ad621303d7d..3e666b0f627 100644
--- a/pkgs/applications/office/moneyplex/default.nix
+++ b/pkgs/applications/office/moneyplex/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, patchelf, coreutils, pcsclite
-, zlib, glib, gdk_pixbuf, gtk2, cairo, pango, libX11, atk, openssl
+, zlib, glib, gdk-pixbuf, gtk2, cairo, pango, libX11, atk, openssl
 , runtimeShell }:
 
 let
   libPath = stdenv.lib.makeLibraryPath [
-    stdenv.cc.cc zlib glib gdk_pixbuf gtk2 cairo pango libX11 atk openssl
+    stdenv.cc.cc zlib glib gdk-pixbuf gtk2 cairo pango libX11 atk openssl
   ];
 
   src_i686 = {
diff --git a/pkgs/applications/office/pinpoint/default.nix b/pkgs/applications/office/pinpoint/default.nix
index 680b3fd40d7..7e6da96db80 100644
--- a/pkgs/applications/office/pinpoint/default.nix
+++ b/pkgs/applications/office/pinpoint/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, autoconf, automake, clutter, clutter-gst
-, gdk_pixbuf, cairo, clutter-gtk }:
+, gdk-pixbuf, cairo, clutter-gtk }:
 
 stdenv.mkDerivation rec {
   name = "pinpoint-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "1jp8chr9vjlpb5lybwp5cg6g90ak5jdzz9baiqkbg0anlg8ps82s";
   };
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake clutter clutter-gst gdk_pixbuf
+  buildInputs = [ autoconf automake clutter clutter-gst gdk-pixbuf
                   cairo clutter-gtk ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/spice-up/default.nix b/pkgs/applications/office/spice-up/default.nix
index a99ac7e44b7..2c3dfa82c8c 100644
--- a/pkgs/applications/office/spice-up/default.nix
+++ b/pkgs/applications/office/spice-up/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , fetchFromGitHub
 , cmake
-, gdk_pixbuf
+, gdk-pixbuf
 , gtk3
 , gettext
 , ninja
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pantheon.elementary-icon-theme
     pantheon.granite
-    gdk_pixbuf
+    gdk-pixbuf
     gtk3
     json-glib
     libevdev
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 86eb0ab4c38..3d4f98ddd44 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -7,7 +7,7 @@
 , dbus
 , fontconfig
 , freetype
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , glibc
 , gtk3
@@ -35,12 +35,12 @@
 stdenv.mkDerivation rec {
   name    = "zotero-${version}";
   version = "5.0.71";
-  
+
   src = fetchurl {
     url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
     sha256 = "070b1ak870jv8h702a9g930p01jsmly93c44igw48ylbgqjyhlwq";
   };
-  
+
   buildInputs= [ wrapGAppsHook gsettings-desktop-schemas gtk3 gnome3.adwaita-icon-theme gnome3.dconf ];
 
   phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
       dbus
       fontconfig
       freetype
-      gdk_pixbuf
+      gdk-pixbuf
       glib
       glibc
       gtk3
diff --git a/pkgs/applications/science/electronics/bitscope/common.nix b/pkgs/applications/science/electronics/bitscope/common.nix
index 64777b5a0ac..9101f1fdbe5 100644
--- a/pkgs/applications/science/electronics/bitscope/common.nix
+++ b/pkgs/applications/science/electronics/bitscope/common.nix
@@ -2,7 +2,7 @@
 , buildFHSUserEnv
 , cairo
 , dpkg
-, gdk_pixbuf
+, gdk-pixbuf
 , glib
 , gtk2-x11
 , makeWrapper
@@ -39,7 +39,7 @@ let
     libs = attrs.libs or [
       atk
       cairo
-      gdk_pixbuf
+      gdk-pixbuf
       glib
       gtk2-x11
       pango
diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix
index 22eb5d07f1c..360f75cc6f0 100644
--- a/pkgs/applications/science/logic/verifast/default.nix
+++ b/pkgs/applications/science/logic/verifast/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, gtk2, gdk_pixbuf, atk, pango, glib, cairo, freetype
+{ stdenv, fetchurl, gtk2, gdk-pixbuf, atk, pango, glib, cairo, freetype
 , fontconfig, libxml2, gnome2 }:
 
 let
 
   libPath = stdenv.lib.makeLibraryPath
-    [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk_pixbuf atk pango glib cairo
+    [ stdenv.cc.libc stdenv.cc.cc gtk2 gdk-pixbuf atk pango glib cairo
       freetype fontconfig libxml2 gnome2.gtksourceview
     ] + ":${stdenv.cc.cc.lib}/lib64:$out/libexec";
 
diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 12d22e2cc3c..ffca24ab27d 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,7 +1,7 @@
 { stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curl, alsaLib
 , libXfixes, atk, gtk3, libXrender, pango, gnome2, gnome3, cairo, freetype, fontconfig
 , libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
-, nss, nspr, cups, fetchurl, expat, gdk_pixbuf, libXdamage, libXrandr, dbus
+, nss, nspr, cups, fetchurl, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
 , dpkg, makeDesktopItem, openssl, wrapGAppsHook, hicolor-icon-theme, at-spi2-atk, libuuid
 }:
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     cups
     alsaLib
     expat
-    gdk_pixbuf
+    gdk-pixbuf
     dbus
     libXdamage
     libXrandr
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 4802d259fb2..d614523f534 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor
-, gtk3, gettext, wrapGAppsHook, gdk_pixbuf, gobject-introspection }:
+, gtk3, gettext, wrapGAppsHook, gdk-pixbuf, gobject-introspection }:
 
 let
   inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3;
@@ -34,7 +34,7 @@ in buildPythonApplication rec {
   ];
 
   propagatedBuildInputs = [
-    gtk3 pygobject3 gdk_pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
+    gtk3 pygobject3 gdk-pixbuf dbus-python ffmpeg mplayer dvdauthor vcdimager cdrkit urllib3
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix
index 6d74c64343d..b4d4312c0fa 100644
--- a/pkgs/applications/video/lightworks/default.nix
+++ b/pkgs/applications/video/lightworks/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, dpkg, makeWrapper, buildFHSUserEnv
-, gtk3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
+, gtk3, gdk-pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU
 , nvidia_cg_toolkit, zlib, openssl, portaudio
 }:
 let
   fullPath = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc
     gtk3
-    gdk_pixbuf
+    gdk-pixbuf
     cairo
     libjpeg_original
     glib
@@ -60,7 +60,7 @@ let
       wrapProgram $out/lib/lightworks/ntcardvt \
         --prefix LD_LIBRARY_PATH : ${fullPath}:$out/lib/lightworks \
         --set FONTCONFIG_FILE $out/lib/lightworks/fonts.conf
-       
+
       cp -r usr/share $out/share
     '';
 
diff --git a/pkgs/applications/video/webtorrent_desktop/default.nix b/pkgs/applications/video/webtorrent_desktop/default.nix
index 086190000ab..0c28b4d5737 100644
--- a/pkgs/applications/video/webtorrent_desktop/default.nix
+++ b/pkgs/applications/video/webtorrent_desktop/default.nix
@@ -1,6 +1,6 @@
 {
   alsaLib, atk, cairo, cups, dbus, dpkg, expat, fetchurl, fontconfig, freetype,
-  gdk_pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor,
+  gdk-pixbuf, glib, gnome2, libX11, libXScrnSaver, libXcomposite, libXcursor,
   libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXtst,
   libxcb, nspr, nss, stdenv, udev
 }:
@@ -15,7 +15,7 @@
     expat
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gnome2.GConf
     gnome2.gtk
diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 25438c81605..5c897926432 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk_pixbuf
+{ stdenv, fetchFromGitHub, luaPackages, cairo, librsvg, cmake, imagemagick, pkgconfig, gdk-pixbuf
 , xorg, libstartup_notification, libxdg_basedir, libpthreadstubs
 , xcb-util-cursor, makeWrapper, pango, gobject-introspection
 , which, dbus, nettools, git, doxygen
@@ -40,7 +40,7 @@ with luaPackages; stdenv.mkDerivation rec {
   FONTCONFIG_FILE = toString fontsConf;
 
   propagatedUserEnvPkgs = [ hicolor-icon-theme ];
-  buildInputs = [ cairo librsvg dbus gdk_pixbuf gobject-introspection
+  buildInputs = [ cairo librsvg dbus gdk-pixbuf gobject-introspection
                   git lgi libpthreadstubs libstartup_notification
                   libxdg_basedir lua nettools pango xcb-util-cursor
                   xorg.libXau xorg.libXdmcp xorg.libxcb xorg.libxshmfence
diff --git a/pkgs/applications/window-managers/dwm/dwm-status.nix b/pkgs/applications/window-managers/dwm/dwm-status.nix
index 734d70598fb..5ffd94e9f87 100644
--- a/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk_pixbuf, libnotify, makeWrapper, pkgconfig, xorg
+{ stdenv, lib, rustPlatform, fetchFromGitHub, dbus, gdk-pixbuf, libnotify, makeWrapper, pkgconfig, xorg
 , enableAlsaUtils ? true, alsaUtils, coreutils
 , enableNetwork ? true, dnsutils, iproute, wirelesstools }:
 
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   };
 
   nativeBuildInputs = [ makeWrapper pkgconfig ];
-  buildInputs = [ dbus gdk_pixbuf libnotify xorg.libX11 ];
+  buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
 
   cargoSha256 = "1r2wczfkdpvjc7iylwajkminraaz1ix6n724in0dvv5klfcdxlxb";
 
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 8406736541c..2f6199122f1 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, cmake, gettext
 , libjpeg, libtiff, libungif, libpng, imlib, expat
-, freetype, fontconfig, pkgconfig, gdk_pixbuf
+, freetype, fontconfig, pkgconfig, gdk-pixbuf
 , mkfontdir, libX11, libXft, libXext, libXinerama
 , libXrandr, libICE, libSM, libXpm, libXdmcp, libxcb
 , libpthreadstubs, pcre }:
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
   [ cmake gettext libjpeg libtiff libungif libpng imlib expat
-    freetype fontconfig pkgconfig gdk_pixbuf mkfontdir libX11
+    freetype fontconfig pkgconfig gdk-pixbuf mkfontdir libX11
     libXft libXext libXinerama libXrandr libICE libSM libXpm
     libXdmcp libxcb libpthreadstubs pcre ];
 
diff --git a/pkgs/applications/window-managers/sawfish/default.nix b/pkgs/applications/window-managers/sawfish/default.nix
index 887a58b748d..d8bb58c21b6 100644
--- a/pkgs/applications/window-managers/sawfish/default.nix
+++ b/pkgs/applications/window-managers/sawfish/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , pkgconfig, which, autoreconfHook
-, rep-gtk, pango, gdk_pixbuf
+, rep-gtk, pango, gdk-pixbuf
 , imlib, gettext, texinfo
 , libXinerama, libXrandr, libXtst, libICE, libSM
 , makeWrapper
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ which
-    rep-gtk pango gdk_pixbuf imlib gettext texinfo
+    rep-gtk pango gdk-pixbuf imlib gettext texinfo
     libXinerama libXrandr libXtst libICE libSM
     makeWrapper ];
 
diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix
index d68cacf666f..595197a3f6f 100644
--- a/pkgs/applications/window-managers/sway/bg.nix
+++ b/pkgs/applications/window-managers/sway/bg.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , meson, ninja, pkgconfig, scdoc
-, wayland, wayland-protocols, cairo, gdk_pixbuf
+, wayland, wayland-protocols, cairo, gdk-pixbuf
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
-  buildInputs = [ wayland wayland-protocols cairo gdk_pixbuf ];
+  buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ];
 
   mesonFlags = [
     "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index 7d5c4c05131..12427b91265 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -2,7 +2,7 @@
 , meson, ninja
 , pkgconfig, scdoc
 , wayland, libxkbcommon, pcre, json_c, dbus, libevdev
-, pango, cairo, libinput, libcap, pam, gdk_pixbuf
+, pango, cairo, libinput, libcap, pam, gdk-pixbuf
 , wlroots, wayland-protocols, swaybg
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     wayland libxkbcommon pcre json_c dbus libevdev
-    pango cairo libinput libcap pam gdk_pixbuf
+    pango cairo libinput libcap pam gdk-pixbuf
     wlroots wayland-protocols
   ];
 
diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix
index a7505e14168..80d6ed4e072 100644
--- a/pkgs/applications/window-managers/sway/lock.nix
+++ b/pkgs/applications/window-managers/sway/lock.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , meson, ninja, pkgconfig, scdoc
-, wayland, wayland-protocols, libxkbcommon, cairo, gdk_pixbuf, pam
+, wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ meson ninja pkgconfig scdoc ];
-  buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk_pixbuf pam ];
+  buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ];
 
   mesonFlags = [
     "-Dpam=enabled" "-Dgdk-pixbuf=enabled" "-Dman-pages=enabled"
diff --git a/pkgs/applications/window-managers/trayer/default.nix b/pkgs/applications/window-managers/trayer/default.nix
index 5aec0973a7c..5705ae8256c 100644
--- a/pkgs/applications/window-managers/trayer/default.nix
+++ b/pkgs/applications/window-managers/trayer/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, gtk2 }:
+{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "trayer-1.1.8";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gdk_pixbuf gtk2 ];
+  buildInputs = [ gdk-pixbuf gtk2 ];
 
   src = fetchFromGitHub {
     owner = "sargon";
diff --git a/pkgs/applications/window-managers/way-cooler/crates-io.nix b/pkgs/applications/window-managers/way-cooler/crates-io.nix
index 9dbd367a67f..29e25640191 100644
--- a/pkgs/applications/window-managers/way-cooler/crates-io.nix
+++ b/pkgs/applications/window-managers/way-cooler/crates-io.nix
@@ -546,76 +546,76 @@ rec {
 # end
 # gdk-pixbuf-0.2.0
 
-  crates.gdk_pixbuf."0.2.0" = deps: { features?(features_.gdk_pixbuf."0.2.0" deps {}) }: buildRustCrate {
+  crates.gdk-pixbuf."0.2.0" = deps: { features?(features_.gdk-pixbuf."0.2.0" deps {}) }: buildRustCrate {
     crateName = "gdk-pixbuf";
     version = "0.2.0";
     authors = [ "The Gtk-rs Project Developers" ];
     sha256 = "082z1s30haa59ax35wsv06mj8z8bhhq0fac36g01qa77kpiphj5y";
-    libName = "gdk_pixbuf";
+    libName = "gdk-pixbuf";
     build = "build.rs";
     dependencies = mapFeatures features ([
-      (crates."gdk_pixbuf_sys"."${deps."gdk_pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps)
-      (crates."glib"."${deps."gdk_pixbuf"."0.2.0"."glib"}" deps)
-      (crates."glib_sys"."${deps."gdk_pixbuf"."0.2.0"."glib_sys"}" deps)
-      (crates."gobject_sys"."${deps."gdk_pixbuf"."0.2.0"."gobject_sys"}" deps)
-      (crates."libc"."${deps."gdk_pixbuf"."0.2.0"."libc"}" deps)
+      (crates."gdk_pixbuf_sys"."${deps."gdk-pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps)
+      (crates."glib"."${deps."gdk-pixbuf"."0.2.0"."glib"}" deps)
+      (crates."glib_sys"."${deps."gdk-pixbuf"."0.2.0"."glib_sys"}" deps)
+      (crates."gobject_sys"."${deps."gdk-pixbuf"."0.2.0"."gobject_sys"}" deps)
+      (crates."libc"."${deps."gdk-pixbuf"."0.2.0"."libc"}" deps)
     ]);
 
     buildDependencies = mapFeatures features ([
 ]);
-    features = mkFeatures (features."gdk_pixbuf"."0.2.0" or {});
+    features = mkFeatures (features."gdk-pixbuf"."0.2.0" or {});
   };
-  features_.gdk_pixbuf."0.2.0" = deps: f: updateFeatures f (rec {
-    gdk_pixbuf = fold recursiveUpdate {} [
-      { "0.2.0".default = (f.gdk_pixbuf."0.2.0".default or true); }
+  features_.gdk-pixbuf."0.2.0" = deps: f: updateFeatures f (rec {
+    gdk-pixbuf = fold recursiveUpdate {} [
+      { "0.2.0".default = (f.gdk-pixbuf."0.2.0".default or true); }
       { "0.2.0".gtk-rs-lgpl-docs =
-        (f.gdk_pixbuf."0.2.0".gtk-rs-lgpl-docs or false) ||
-        (f.gdk_pixbuf."0.2.0".embed-lgpl-docs or false) ||
-        (gdk_pixbuf."0.2.0"."embed-lgpl-docs" or false) ||
-        (f.gdk_pixbuf."0.2.0".purge-lgpl-docs or false) ||
-        (gdk_pixbuf."0.2.0"."purge-lgpl-docs" or false); }
+        (f.gdk-pixbuf."0.2.0".gtk-rs-lgpl-docs or false) ||
+        (f.gdk-pixbuf."0.2.0".embed-lgpl-docs or false) ||
+        (gdk-pixbuf."0.2.0"."embed-lgpl-docs" or false) ||
+        (f.gdk-pixbuf."0.2.0".purge-lgpl-docs or false) ||
+        (gdk-pixbuf."0.2.0"."purge-lgpl-docs" or false); }
       { "0.2.0".v2_28 =
-        (f.gdk_pixbuf."0.2.0".v2_28 or false) ||
-        (f.gdk_pixbuf."0.2.0".v2_30 or false) ||
-        (gdk_pixbuf."0.2.0"."v2_30" or false); }
+        (f.gdk-pixbuf."0.2.0".v2_28 or false) ||
+        (f.gdk-pixbuf."0.2.0".v2_30 or false) ||
+        (gdk-pixbuf."0.2.0"."v2_30" or false); }
       { "0.2.0".v2_30 =
-        (f.gdk_pixbuf."0.2.0".v2_30 or false) ||
-        (f.gdk_pixbuf."0.2.0".v2_32 or false) ||
-        (gdk_pixbuf."0.2.0"."v2_32" or false); }
+        (f.gdk-pixbuf."0.2.0".v2_30 or false) ||
+        (f.gdk-pixbuf."0.2.0".v2_32 or false) ||
+        (gdk-pixbuf."0.2.0"."v2_32" or false); }
       { "0.2.0".v2_32 =
-        (f.gdk_pixbuf."0.2.0".v2_32 or false) ||
-        (f.gdk_pixbuf."0.2.0".v2_36 or false) ||
-        (gdk_pixbuf."0.2.0"."v2_36" or false); }
+        (f.gdk-pixbuf."0.2.0".v2_32 or false) ||
+        (f.gdk-pixbuf."0.2.0".v2_36 or false) ||
+        (gdk-pixbuf."0.2.0"."v2_36" or false); }
     ];
     gdk_pixbuf_sys = fold recursiveUpdate {} [
-      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" =
-        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" or false) ||
-        (gdk_pixbuf."0.2.0"."v2_28" or false) ||
-        (f."gdk_pixbuf"."0.2.0"."v2_28" or false); }
-      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" =
-        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" or false) ||
-        (gdk_pixbuf."0.2.0"."v2_30" or false) ||
-        (f."gdk_pixbuf"."0.2.0"."v2_30" or false); }
-      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" =
-        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" or false) ||
-        (gdk_pixbuf."0.2.0"."v2_32" or false) ||
-        (f."gdk_pixbuf"."0.2.0"."v2_32" or false); }
-      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" =
-        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" or false) ||
-        (gdk_pixbuf."0.2.0"."v2_36" or false) ||
-        (f."gdk_pixbuf"."0.2.0"."v2_36" or false); }
-      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}".default = true; }
+      { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" =
+        (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" or false) ||
+        (gdk-pixbuf."0.2.0"."v2_28" or false) ||
+        (f."gdk-pixbuf"."0.2.0"."v2_28" or false); }
+      { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" =
+        (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" or false) ||
+        (gdk-pixbuf."0.2.0"."v2_30" or false) ||
+        (f."gdk-pixbuf"."0.2.0"."v2_30" or false); }
+      { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" =
+        (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" or false) ||
+        (gdk-pixbuf."0.2.0"."v2_32" or false) ||
+        (f."gdk-pixbuf"."0.2.0"."v2_32" or false); }
+      { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" =
+        (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" or false) ||
+        (gdk-pixbuf."0.2.0"."v2_36" or false) ||
+        (f."gdk-pixbuf"."0.2.0"."v2_36" or false); }
+      { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}".default = true; }
     ];
-    glib."${deps.gdk_pixbuf."0.2.0".glib}".default = true;
-    glib_sys."${deps.gdk_pixbuf."0.2.0".glib_sys}".default = true;
-    gobject_sys."${deps.gdk_pixbuf."0.2.0".gobject_sys}".default = true;
-    libc."${deps.gdk_pixbuf."0.2.0".libc}".default = true;
+    glib."${deps.gdk-pixbuf."0.2.0".glib}".default = true;
+    glib_sys."${deps.gdk-pixbuf."0.2.0".glib_sys}".default = true;
+    gobject_sys."${deps.gdk-pixbuf."0.2.0".gobject_sys}".default = true;
+    libc."${deps.gdk-pixbuf."0.2.0".libc}".default = true;
   }) [
-    (features_.gdk_pixbuf_sys."${deps."gdk_pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps)
-    (features_.glib."${deps."gdk_pixbuf"."0.2.0"."glib"}" deps)
-    (features_.glib_sys."${deps."gdk_pixbuf"."0.2.0"."glib_sys"}" deps)
-    (features_.gobject_sys."${deps."gdk_pixbuf"."0.2.0"."gobject_sys"}" deps)
-    (features_.libc."${deps."gdk_pixbuf"."0.2.0"."libc"}" deps)
+    (features_.gdk_pixbuf_sys."${deps."gdk-pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps)
+    (features_.glib."${deps."gdk-pixbuf"."0.2.0"."glib"}" deps)
+    (features_.glib_sys."${deps."gdk-pixbuf"."0.2.0"."glib_sys"}" deps)
+    (features_.gobject_sys."${deps."gdk-pixbuf"."0.2.0"."gobject_sys"}" deps)
+    (features_.libc."${deps."gdk-pixbuf"."0.2.0"."libc"}" deps)
   ];
 
 
@@ -2357,7 +2357,7 @@ rec {
       (crates."dbus"."${deps."way_cooler"."0.8.1"."dbus"}" deps)
       (crates."dbus_macros"."${deps."way_cooler"."0.8.1"."dbus_macros"}" deps)
       (crates."env_logger"."${deps."way_cooler"."0.8.1"."env_logger"}" deps)
-      (crates."gdk_pixbuf"."${deps."way_cooler"."0.8.1"."gdk_pixbuf"}" deps)
+      (crates."gdk-pixbuf"."${deps."way_cooler"."0.8.1"."gdk-pixbuf"}" deps)
       (crates."getopts"."${deps."way_cooler"."0.8.1"."getopts"}" deps)
       (crates."glib"."${deps."way_cooler"."0.8.1"."glib"}" deps)
       (crates."json_macro"."${deps."way_cooler"."0.8.1"."json_macro"}" deps)
@@ -2386,7 +2386,7 @@ rec {
     dbus."${deps.way_cooler."0.8.1".dbus}".default = true;
     dbus_macros."${deps.way_cooler."0.8.1".dbus_macros}".default = true;
     env_logger."${deps.way_cooler."0.8.1".env_logger}".default = true;
-    gdk_pixbuf."${deps.way_cooler."0.8.1".gdk_pixbuf}".default = true;
+    gdk-pixbuf."${deps.way_cooler."0.8.1".gdk-pixbuf}".default = true;
     getopts."${deps.way_cooler."0.8.1".getopts}".default = true;
     glib."${deps.way_cooler."0.8.1".glib}".default = true;
     json_macro."${deps.way_cooler."0.8.1".json_macro}".default = true;
@@ -2434,7 +2434,7 @@ rec {
     (features_.dbus."${deps."way_cooler"."0.8.1"."dbus"}" deps)
     (features_.dbus_macros."${deps."way_cooler"."0.8.1"."dbus_macros"}" deps)
     (features_.env_logger."${deps."way_cooler"."0.8.1"."env_logger"}" deps)
-    (features_.gdk_pixbuf."${deps."way_cooler"."0.8.1"."gdk_pixbuf"}" deps)
+    (features_.gdk-pixbuf."${deps."way_cooler"."0.8.1"."gdk-pixbuf"}" deps)
     (features_.getopts."${deps."way_cooler"."0.8.1"."getopts"}" deps)
     (features_.glib."${deps."way_cooler"."0.8.1"."glib"}" deps)
     (features_.json_macro."${deps."way_cooler"."0.8.1"."json_macro"}" deps)
diff --git a/pkgs/applications/window-managers/way-cooler/default.nix b/pkgs/applications/window-managers/way-cooler/default.nix
index 24320ff0073..f06020143d7 100644
--- a/pkgs/applications/window-managers/way-cooler/default.nix
+++ b/pkgs/applications/window-managers/way-cooler/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper, symlinkJoin, writeShellScriptBin, callPackage, defaultCrateOverrides
-, wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk_pixbuf
+, wayland, wlc, cairo, libxkbcommon, pam, python3Packages, lemonbar, gdk-pixbuf
 }:
 
 let
@@ -22,7 +22,7 @@ let
   way-cooler = ((way_cooler_ { builtin-lua = true; }).override {
     crateOverrides = defaultCrateOverrides // {
 
-    way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk_pixbuf wayland ]; };
+    way-cooler = attrs: { buildInputs = [ wlc cairo libxkbcommon fakegit gdk-pixbuf wayland ]; };
   };}).overrideAttrs (oldAttrs: rec {
     postBuild = ''
       mkdir -p $out/etc
diff --git a/pkgs/applications/window-managers/yabar/build.nix b/pkgs/applications/window-managers/yabar/build.nix
index 6fc1797dd25..678ebad75dd 100644
--- a/pkgs/applications/window-managers/yabar/build.nix
+++ b/pkgs/applications/window-managers/yabar/build.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cairo, gdk_pixbuf, libconfig, pango, pkgconfig
+{ stdenv, fetchFromGitHub, cairo, gdk-pixbuf, libconfig, pango, pkgconfig
 , xcbutilwm, alsaLib, wirelesstools, asciidoc, libxslt, makeWrapper, docbook_xsl
 , configFile ? null, lib
 , rev, sha256, version, patches ? []
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    cairo gdk_pixbuf libconfig pango xcbutilwm docbook_xsl
+    cairo gdk-pixbuf libconfig pango xcbutilwm docbook_xsl
     alsaLib wirelesstools asciidoc libxslt makeWrapper
   ];
 
diff --git a/pkgs/build-support/appimage/default.nix b/pkgs/build-support/appimage/default.nix
index 990f1ce2e3e..1f84403c10f 100644
--- a/pkgs/build-support/appimage/default.nix
+++ b/pkgs/build-support/appimage/default.nix
@@ -97,7 +97,7 @@ rec {
       gtk2
       bzip2
       zlib
-      gdk_pixbuf
+      gdk-pixbuf
 
       xorg.libXinerama
       xorg.libXdamage
diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix
index c0b1797f73f..b3ab9f5ba78 100644
--- a/pkgs/build-support/rust/default-crate-overrides.nix
+++ b/pkgs/build-support/rust/default-crate-overrides.nix
@@ -1,5 +1,5 @@
 { stdenv, pkgconfig, curl, darwin, libiconv, libgit2, libssh2,
-  openssl, sqlite, zlib, dbus, dbus-glib, gdk_pixbuf, cairo, python3,
+  openssl, sqlite, zlib, dbus, dbus-glib, gdk-pixbuf, cairo, python3,
   libsodium, postgresql, gmp, foundationdb, ... }:
 
 let
@@ -62,7 +62,7 @@ in
   };
 
   gdk-pixbuf = attrs: {
-    buildInputs = [ gdk_pixbuf ];
+    buildInputs = [ gdk-pixbuf ];
   };
 
   libgit2-sys = attrs: {
diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
index d4a15a105cd..4b42f0b6ee9 100644
--- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, gdk_pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }:
+{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "elementary-xfce-icon-theme-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "16msdrazhbv80cvh5ffvgj13xmkpf87r7mq6xz071fza6nv7g0jn";
   };
 
-  nativeBuildInputs = [ pkgconfig gdk_pixbuf librsvg optipng gtk3 hicolor-icon-theme ];
+  nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 hicolor-icon-theme ];
 
   postPatch = ''
     substituteInPlace svgtopng/Makefile --replace "-O0" "-O"
diff --git a/pkgs/data/themes/greybird/default.nix b/pkgs/data/themes/greybird/default.nix
index 02c8d2b6490..d573603ce90 100644
--- a/pkgs/data/themes/greybird/default.nix
+++ b/pkgs/data/themes/greybird/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, autoreconfHook, which, sassc, glib, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   pname = "greybird";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gdk_pixbuf
+    gdk-pixbuf
     librsvg
   ];
 
diff --git a/pkgs/data/themes/matcha/default.nix b/pkgs/data/themes/matcha/default.nix
index 5a43511d532..762ab3eac3e 100644
--- a/pkgs/data/themes/matcha/default.nix
+++ b/pkgs/data/themes/matcha/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   name = "matcha-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1x954rmxv14xndn4ybhbr4pmzccnwqp462bpvzd2hak5wsqs4wxc";
   };
 
-  buildInputs = [ gdk_pixbuf librsvg ];
+  buildInputs = [ gdk-pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/data/themes/materia-theme/default.nix b/pkgs/data/themes/materia-theme/default.nix
index 46b44d3ff90..ccdd1067302 100644
--- a/pkgs/data/themes/materia-theme/default.nix
+++ b/pkgs/data/themes/materia-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
+{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
 
 stdenv.mkDerivation rec {
   pname = "materia-theme";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ glib libxml2 bc ];
 
-  buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ];
+  buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/data/themes/plano/default.nix b/pkgs/data/themes/plano/default.nix
index d672855df09..b009bd2780c 100644
--- a/pkgs/data/themes/plano/default.nix
+++ b/pkgs/data/themes/plano/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gdk_pixbuf, gtk_engines, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, gdk-pixbuf, gtk_engines, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   pname = "plano-theme";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0p9j4p32489jb6d67jhf9x26my0mddcc6a174x713drch8zvb96l";
   };
 
-  buildInputs = [ gdk_pixbuf gtk_engines ];
+  buildInputs = [ gdk-pixbuf gtk_engines ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/data/themes/plata/default.nix b/pkgs/data/themes/plata/default.nix
index 0d87cd848f8..52d843a5986 100644
--- a/pkgs/data/themes/plata/default.nix
+++ b/pkgs/data/themes/plata/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitLab, autoreconfHook, pkgconfig, parallel
-, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine
+, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine
 , cinnamonSupport ? true
 , gnomeFlashbackSupport ? true
 , gnomeShellSupport ? true
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   ++ stdenv.lib.optional telegramSupport zip;
 
   buildInputs = [
-    gdk_pixbuf
+    gdk-pixbuf
     librsvg
   ];
 
diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix
index aac9ec5e85e..4d91b60960b 100644
--- a/pkgs/data/themes/qogir/default.nix
+++ b/pkgs/data/themes/qogir/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, gdk-pixbuf, librsvg, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   pname = "qogir-theme";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "031nqr47b3x8ahcym7cfc75y8sy53dcmrrrlywi7m1a10ckfp0pd";
   };
 
-  buildInputs = [ gdk_pixbuf librsvg ];
+  buildInputs = [ gdk-pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/data/themes/sierra/default.nix b/pkgs/data/themes/sierra/default.nix
index b845522a28a..e5b5ad8d611 100644
--- a/pkgs/data/themes/sierra/default.nix
+++ b/pkgs/data/themes/sierra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libxml2, gdk_pixbuf, librsvg, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, libxml2, gdk-pixbuf, librsvg, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   pname = "sierra-gtk-theme";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ libxml2 ];
 
-  buildInputs = [ gdk_pixbuf librsvg ];
+  buildInputs = [ gdk-pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/data/themes/stilo/default.nix b/pkgs/data/themes/stilo/default.nix
index 48f29ad3111..61ec697d841 100644
--- a/pkgs/data/themes/stilo/default.nix
+++ b/pkgs/data/themes/stilo/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   pname = "stilo-themes";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja sassc ];
 
-  buildInputs = [ gdk_pixbuf librsvg gtk_engines ];
+  buildInputs = [ gdk-pixbuf librsvg gtk_engines ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/data/themes/zuki/default.nix b/pkgs/data/themes/zuki/default.nix
index f55ed31c1ce..59099bf5227 100644
--- a/pkgs/data/themes/zuki/default.nix
+++ b/pkgs/data/themes/zuki/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk_pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
+{ stdenv, fetchFromGitHub, meson, ninja, sassc, gdk-pixbuf, librsvg, gtk_engines, gtk-engine-murrine }:
 
 stdenv.mkDerivation rec {
   pname = "zuki-themes";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ meson ninja sassc ];
 
-  buildInputs = [ gdk_pixbuf librsvg gtk_engines ];
+  buildInputs = [ gdk-pixbuf librsvg gtk_engines ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix
index a6282b979f7..6f3a851eb2f 100644
--- a/pkgs/desktops/deepin/go-lib/default.nix
+++ b/pkgs/desktops/deepin/go-lib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, glib, xorg, gdk_pixbuf, pulseaudio,
+{ stdenv, fetchFromGitHub, glib, xorg, gdk-pixbuf, pulseaudio,
   mobile-broadband-provider-info, deepin }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib
     xorg.libX11
-    gdk_pixbuf
+    gdk-pixbuf
     pulseaudio
     mobile-broadband-provider-info
   ];
diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix
index 8e75917907a..eb220dcdae6 100644
--- a/pkgs/desktops/deepin/qcef/default.nix
+++ b/pkgs/desktops/deepin/qcef/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, pkgconfig, cmake, qtbase, qttools,
   qtwebchannel, qtx11extras,
   gnome2, nss, nspr, alsaLib, atk, cairo, cups, dbus,
-  expat, fontconfig, gdk_pixbuf, glib, gtk2,
+  expat, fontconfig, gdk-pixbuf, glib, gtk2,
   libxcb, pango, pulseaudio, xorg, deepin }:
 
 let
@@ -14,7 +14,7 @@ let
     dbus
     expat
     fontconfig
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gnome2.GConf
     gtk2
diff --git a/pkgs/desktops/gnome-3/apps/cheese/default.nix b/pkgs/desktops/gnome-3/apps/cheese/default.nix
index 4e5595385b4..f21e81237b2 100644
--- a/pkgs/desktops/gnome-3/apps/cheese/default.nix
+++ b/pkgs/desktops/gnome-3/apps/cheese/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk3, glib, clutter-gtk, clutter-gst, udev, gst_all_1, itstool
 , libgudev, autoreconfHook, vala, docbook_xml_dtd_43, docbook_xsl, appstream-glib
 , libxslt, yelp-tools, gnome-common, gtk-doc
-, adwaita-icon-theme, librsvg, totem, gdk_pixbuf, gnome3, gnome-desktop, libxml2 }:
+, adwaita-icon-theme, librsvg, totem, gdk-pixbuf, gnome3, gnome-desktop, libxml2 }:
 
 stdenv.mkDerivation rec {
   name = "cheese-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     autoreconfHook gtk-doc yelp-tools gnome-common
   ];
   buildInputs = [ gtk3 glib gnome-video-effects
-                  gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer
+                  gdk-pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer
                   gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome-desktop
                   gst_all_1.gst-plugins-bad clutter-gtk clutter-gst
                   libcanberra-gtk3 libgudev ];
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
       # vp8enc preset
       --prefix GST_PRESET_PATH : "${gst_all_1.gst-plugins-good}/share/gstreamer-1.0/presets"
       # Thumbnailers
-      --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
+      --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${totem}/share"
     )
   '';
diff --git a/pkgs/desktops/gnome-3/apps/evolution/default.nix b/pkgs/desktops/gnome-3/apps/evolution/default.nix
index b82c1b2dfe5..621506653d6 100644
--- a/pkgs/desktops/gnome-3/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/apps/evolution/default.nix
@@ -27,7 +27,7 @@
 , sqlite
 , gnome3
 , librsvg
-, gdk_pixbuf
+, gdk-pixbuf
 , libsecret
 , nss
 , nspr
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     db
     evolution-data-server
     gcr
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     glib-networking
     gnome-desktop
diff --git a/pkgs/desktops/gnome-3/apps/glade/default.nix b/pkgs/desktops/gnome-3/apps/glade/default.nix
index e0078d5ae41..4424eb4a3fd 100644
--- a/pkgs/desktops/gnome-3/apps/glade/default.nix
+++ b/pkgs/desktops/gnome-3/apps/glade/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, python3
 , pkgconfig, gtk3, glib, gobject-introspection
 , wrapGAppsHook, itstool, libxml2, docbook_xsl
-, gnome3, gdk_pixbuf, libxslt, gsettings-desktop-schemas }:
+, gnome3, gdk-pixbuf, libxslt, gsettings-desktop-schemas }:
 
 stdenv.mkDerivation rec {
   name = "glade-${version}";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3 glib libxml2 python3 python3.pkgs.pygobject3
     gsettings-desktop-schemas
-    gdk_pixbuf gnome3.adwaita-icon-theme
+    gdk-pixbuf gnome3.adwaita-icon-theme
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
index 6edf86ec552..25ee957224c 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-books/default.nix
@@ -1,6 +1,6 @@
 { stdenv, meson, ninja, gettext, fetchurl, evince, gjs
 , pkgconfig, gtk3, glib, tracker, tracker-miners, libxslt
-, webkitgtk, gnome-desktop, libgepub, gnome3, gdk_pixbuf
+, webkitgtk, gnome-desktop, libgepub, gnome3, gdk-pixbuf
 , gsettings-desktop-schemas, adwaita-icon-theme, docbook_xsl
 , docbook_xml_dtd_42, desktop-file-utils, python3
 , gobject-introspection, wrapGAppsHook }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3 glib gsettings-desktop-schemas
-    gdk_pixbuf adwaita-icon-theme evince
+    gdk-pixbuf adwaita-icon-theme evince
     webkitgtk gjs gobject-introspection tracker
     tracker-miners gnome-desktop libgepub
   ];
diff --git a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
index f29f324f2ee..d2845bef2a1 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-clocks/default.nix
@@ -2,7 +2,7 @@
 , meson, ninja, gettext, pkgconfig, wrapGAppsHook, itstool, desktop-file-utils
 , vala, gobject-introspection, libxml2, gtk3, glib, gsound, sound-theme-freedesktop
 , gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, geocode-glib
-, gnome3, gdk_pixbuf, geoclue2, libgweather }:
+, gnome3, gdk-pixbuf, geoclue2, libgweather }:
 
 stdenv.mkDerivation rec {
   name = "gnome-clocks-${version}";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     gobject-introspection # for finding vapi files
   ];
   buildInputs = [
-    gtk3 glib gsettings-desktop-schemas gdk_pixbuf adwaita-icon-theme
+    gtk3 glib gsettings-desktop-schemas gdk-pixbuf adwaita-icon-theme
     gnome-desktop geocode-glib geoclue2 libgweather gsound
   ];
 
diff --git a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
index e0f28bc3446..e8796d49e9a 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-documents/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk3, glib, tracker, tracker-miners
 , itstool, libxslt, webkitgtk, libgdata
 , gnome-desktop, libzapojit, libgepub
-, gnome3, gdk_pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
+, gnome3, gdk-pixbuf, libsoup, docbook_xsl, docbook_xml_dtd_42
 , gobject-introspection, inkscape, poppler_utils
 , desktop-file-utils, wrapGAppsHook, python3, gsettings-desktop-schemas }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     gtk3 glib gsettings-desktop-schemas
-    gdk_pixbuf gnome3.adwaita-icon-theme evince
+    gdk-pixbuf gnome3.adwaita-icon-theme evince
     libsoup webkitgtk gjs gobject-introspection
     tracker tracker-miners libgdata
     gnome-desktop libzapojit libgepub
diff --git a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
index 25faf2676b8..6011092c0e0 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-maps/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, gettext, python3, pkgconfig, gnome3, gtk3
-, gobject-introspection, gdk_pixbuf, librsvg, libgweather
+, gobject-introspection, gdk-pixbuf, librsvg, libgweather
 , geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, libsoup, gsettings-desktop-schemas
 , webkitgtk, gjs, libgee, geocode-glib, evolution-data-server, gnome-online-accounts }:
 
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
     gobject-introspection
     gtk3 geoclue2 gjs libgee folks gfbgraph
     geocode-glib libchamplain libsoup
-    gdk_pixbuf librsvg libgweather
+    gdk-pixbuf librsvg libgweather
     gsettings-desktop-schemas evolution-data-server
     gnome-online-accounts gnome3.adwaita-icon-theme
     webkitgtk
diff --git a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
index 1f1bfafb595..9b8c96729ad 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-music/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, meson, ninja, gettext, fetchurl, gdk_pixbuf, tracker
+{ stdenv, meson, ninja, gettext, fetchurl, gdk-pixbuf, tracker
 , libxml2, python3, libnotify, wrapGAppsHook, libmediaart
 , gobject-introspection, gnome-online-accounts, grilo, grilo-plugins
 , pkgconfig, gtk3, glib, desktop-file-utils, appstream-glib
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec {
   nativeBuildInputs = [ meson ninja gettext itstool pkgconfig libxml2 wrapGAppsHook desktop-file-utils appstream-glib gobject-introspection ];
   buildInputs = with gst_all_1; [
     gtk3 glib libmediaart gnome-online-accounts gobject-introspection
-    gdk_pixbuf gnome3.adwaita-icon-theme python3
+    gdk-pixbuf gnome3.adwaita-icon-theme python3
     grilo grilo-plugins libnotify libdazzle libsoup
     gsettings-desktop-schemas tracker
     gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly
diff --git a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
index 9d08cc24aad..e5bd4d8b950 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-photos/default.nix
@@ -3,7 +3,7 @@
 , itstool, gegl, babl, libdazzle, gfbgraph, grilo-plugins
 , grilo, gnome-online-accounts
 , desktop-file-utils, wrapGAppsHook
-, gnome3, gdk_pixbuf, gexiv2, geocode-glib
+, gnome3, gdk-pixbuf, gexiv2, geocode-glib
 , dleyna-renderer, dbus, meson, ninja, python3, gsettings-desktop-schemas }:
 
 let
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     gtk3 glib gegl babl libgdata libdazzle
     gsettings-desktop-schemas
-    gdk_pixbuf gnome3.adwaita-icon-theme
+    gdk-pixbuf gnome3.adwaita-icon-theme
     gfbgraph grilo-plugins grilo
     gnome-online-accounts tracker
     gexiv2 geocode-glib dleyna-renderer
diff --git a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
index fbf80fc32e8..907c0424454 100644
--- a/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
+++ b/pkgs/desktops/gnome-3/apps/gnome-sound-recorder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk_pixbuf, gst_all_1, gnome3
+{ stdenv, fetchurl, pkgconfig, gettext, gobject-introspection, wrapGAppsHook, gjs, glib, gtk3, gdk-pixbuf, gst_all_1, gnome3
 , meson, ninja, python3, hicolor-icon-theme, desktop-file-utils }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     pkgconfig gettext meson ninja gobject-introspection
     wrapGAppsHook python3 hicolor-icon-theme desktop-file-utils
   ];
-  buildInputs = [ gjs glib gtk3 gdk_pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);
+  buildInputs = [ gjs glib gtk3 gdk-pixbuf ] ++ (with gst_all_1; [ gstreamer.dev gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad ]);
 
   postPatch = ''
     chmod +x build-aux/meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/apps/polari/default.nix b/pkgs/desktops/gnome-3/apps/polari/default.nix
index 73b8016d97b..51fea63b714 100644
--- a/pkgs/desktops/gnome-3/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/apps/polari/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, itstool, fetchurl, gdk_pixbuf, adwaita-icon-theme
+{ stdenv, itstool, fetchurl, gdk-pixbuf, adwaita-icon-theme
 , telepathy-glib, gjs, meson, ninja, gettext, telepathy-idle, libxml2, desktop-file-utils
 , pkgconfig, gtk3, glib, libsecret, libsoup, gobject-introspection, appstream-glib
 , gnome3, wrapGAppsHook, telepathy-logger, gspell, gsettings-desktop-schemas }:
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     gtk3 glib adwaita-icon-theme gsettings-desktop-schemas
-    telepathy-glib telepathy-logger gjs gspell gdk_pixbuf libsecret libsoup
+    telepathy-glib telepathy-logger gjs gspell gdk-pixbuf libsecret libsoup
   ];
 
   passthru = {
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
index 0f88372d9cf..9ef94adcbd0 100644
--- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
+++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome3
-, iconnamingutils, gtk3, gdk_pixbuf, librsvg, hicolor-icon-theme }:
+, iconnamingutils, gtk3, gdk-pixbuf, librsvg, hicolor-icon-theme }:
 
 stdenv.mkDerivation rec {
   name = "adwaita-icon-theme-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   # For convenience, we can specify adwaita-icon-theme only in packages
   propagatedBuildInputs = [ hicolor-icon-theme ];
 
-  buildInputs = [ gdk_pixbuf librsvg ];
+  buildInputs = [ gdk-pixbuf librsvg ];
 
   nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ];
 
diff --git a/pkgs/desktops/gnome-3/core/empathy/default.nix b/pkgs/desktops/gnome-3/core/empathy/default.nix
index 5a08454cb35..73c3f65a968 100644
--- a/pkgs/desktops/gnome-3/core/empathy/default.nix
+++ b/pkgs/desktops/gnome-3/core/empathy/default.nix
@@ -1,5 +1,5 @@
 { stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, gnome3, gdk_pixbuf, python3
+, file, librsvg, gnome3, gdk-pixbuf, python3
 , telepathy-glib, telepathy-farstream, glibcLocales
 , clutter-gtk, clutter-gst, gst_all_1, cogl, gnome-online-accounts
 , gcr, libsecret, folks, libpulseaudio, telepathy-mission-control
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     gtk3 glib webkitgtk icu gnome-online-accounts
     telepathy-glib clutter-gtk clutter-gst cogl
     gst_all_1.gstreamer gst_all_1.gst-plugins-base
-    gcr libsecret libpulseaudio gdk_pixbuf
+    gcr libsecret libpulseaudio gdk-pixbuf
     libnotify clutter libsoup gnutls libgee p11-kit
     libcanberra-gtk3 telepathy-farstream farstream
     gnome3.adwaita-icon-theme gsettings-desktop-schemas
diff --git a/pkgs/desktops/gnome-3/core/eog/default.nix b/pkgs/desktops/gnome-3/core/eog/default.nix
index 5c896ec01fc..8bb727a6fc5 100644
--- a/pkgs/desktops/gnome-3/core/eog/default.nix
+++ b/pkgs/desktops/gnome-3/core/eog/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, meson, ninja, gettext, itstool, pkgconfig, libxml2, libjpeg, libpeas, gnome3
-, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk_pixbuf, exempi
+, gtk3, glib, gsettings-desktop-schemas, adwaita-icon-theme, gnome-desktop, lcms2, gdk-pixbuf, exempi
 , shared-mime-info, wrapGAppsHook, librsvg, libexif, gobject-introspection, python3 }:
 
 let
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ meson ninja pkgconfig gettext itstool wrapGAppsHook libxml2 gobject-introspection python3 ];
 
   buildInputs = [
-    libjpeg gtk3 gdk_pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi
+    libjpeg gtk3 gdk-pixbuf glib libpeas librsvg lcms2 gnome-desktop libexif exempi
     gsettings-desktop-schemas shared-mime-info adwaita-icon-theme
   ];
 
@@ -28,7 +28,7 @@ in stdenv.mkDerivation rec {
   preFixup = ''
     gappsWrapperArgs+=(
       # Thumbnailers
-      --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
+      --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${librsvg}/share"
       --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
     )
diff --git a/pkgs/desktops/gnome-3/core/epiphany/default.nix b/pkgs/desktops/gnome-3/core/epiphany/default.nix
index f4e87b50906..776da94242f 100644
--- a/pkgs/desktops/gnome-3/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/core/epiphany/default.nix
@@ -2,7 +2,7 @@
 , wrapGAppsHook, gnome3, libxml2, libxslt, itstool
 , webkitgtk, libsoup, glib-networking, libsecret, gnome-desktop, libnotify, p11-kit
 , sqlite, gcr, isocodes, desktop-file-utils, python3
-, gdk_pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
+, gdk-pixbuf, gst_all_1, json-glib, libdazzle, libhandy }:
 
 stdenv.mkDerivation rec {
   name = "epiphany-${version}";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gtk3 glib webkitgtk libsoup libxml2 libsecret gnome-desktop libnotify
     sqlite isocodes p11-kit icu libhandy
-    gdk_pixbuf gnome3.adwaita-icon-theme gcr
+    gdk-pixbuf gnome3.adwaita-icon-theme gcr
     glib-networking gst_all_1.gstreamer gst_all_1.gst-plugins-base
     gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly
     gst_all_1.gst-libav json-glib libdazzle
diff --git a/pkgs/desktops/gnome-3/core/evince/default.nix b/pkgs/desktops/gnome-3/core/evince/default.nix
index 68beb0e47e3..9313ca8990c 100644
--- a/pkgs/desktops/gnome-3/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/core/evince/default.nix
@@ -11,7 +11,7 @@
 , gtk3
 , pango
 , atk
-, gdk_pixbuf
+, gdk-pixbuf
 , shared-mime-info
 , itstool
 , gnome3
@@ -83,7 +83,7 @@ stdenv.mkDerivation rec {
     gtk3
     pango
     atk
-    gdk_pixbuf
+    gdk-pixbuf
     libxml2
     gsettings-desktop-schemas
     poppler
diff --git a/pkgs/desktops/gnome-3/core/gjs/default.nix b/pkgs/desktops/gnome-3/core/gjs/default.nix
index ef4de369915..4e43d5f9d50 100644
--- a/pkgs/desktops/gnome-3/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/core/gjs/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, atk, gobject-introspection
-, spidermonkey_60, pango, readline, glib, libxml2, dbus, gdk_pixbuf
+, spidermonkey_60, pango, readline, glib, libxml2, dbus, gdk-pixbuf
 , makeWrapper }:
 
 stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     moveToOutput "libexec/gjs/installed-tests" "$installedTests"
 
     wrapProgram "$installedTests/libexec/gjs/installed-tests/minijasmine" \
-      --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk_pixbuf ]}:$installedTests/libexec/gjs/installed-tests"
+      --prefix GI_TYPELIB_PATH : "${stdenv.lib.makeSearchPath "lib/girepository-1.0" [ gtk3 atk pango.out gdk-pixbuf ]}:$installedTests/libexec/gjs/installed-tests"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
index c7a9b4ccfbd..e947f8625c6 100644
--- a/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-control-center/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, substituteAll, meson, ninja, pkgconfig, gnome3, ibus, gettext, upower, wrapGAppsHook
 , libcanberra-gtk3, accountsservice, libpwquality, libpulseaudio
-, gdk_pixbuf, librsvg, libgudev, libsecret, gnome-color-manager
+, gdk-pixbuf, librsvg, libgudev, libsecret, gnome-color-manager
 , libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
 , libkrb5, networkmanagerapplet, networkmanager, glibc
 , libwacom, samba, shared-mime-info, tzdata, libgnomekbd
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     gnome-online-accounts libsoup colord libpulseaudio fontconfig colord-gtk
     accountsservice libkrb5 networkmanagerapplet libwacom samba
     grilo libpwquality vino libcanberra-gtk3 libgudev libsecret
-    gdk_pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
+    gdk-pixbuf adwaita-icon-theme librsvg clutter clutter-gtk cheese
     networkmanager modemmanager gnome-bluetooth tracker
     udisks2 gsound libhandy
     mutter # schemas for the keybindings
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     gappsWrapperArgs+=(
       --prefix XDG_DATA_DIRS : "${sound-theme-freedesktop}/share"
       # Thumbnailers (for setting user profile pictures)
-      --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
+      --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${librsvg}/share"
       # WM keyboard shortcuts
       --prefix XDG_DATA_DIRS : "${mutter}/share"
diff --git a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
index 4a22fc53519..fd507acc009 100644
--- a/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-remote-desktop/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitLab, meson, ninja, pkgconfig, python3, wrapGAppsHook
-, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk_pixbuf, gnome3 }:
+, glib, pipewire, systemd, libvncserver, libsecret, libnotify, gdk-pixbuf, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "gnome-remote-desktop";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     glib pipewire systemd libvncserver libsecret libnotify
-    gdk_pixbuf # For libnotify
+    gdk-pixbuf # For libnotify
   ];
 
   postPatch = ''
diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
index d9001d9b1b9..1363cf6d669 100644
--- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix
@@ -3,7 +3,7 @@
 , libstartup_notification, telepathy-glib, telepathy-logger, libXtst, unzip, glibcLocales, shared-mime-info
 , libgweather, libcanberra-gtk3, librsvg, geoclue2, perl, docbook_xml_dtd_42, desktop-file-utils
 , libpulseaudio, libical, gobject-introspection, gstreamer, wrapGAppsHook, libxslt, gcr, caribou
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
+, accountsservice, gdk-pixbuf, gdm, upower, ibus, networkmanagerapplet, libgnomekbd, gnome-desktop
 , gsettings-desktop-schemas, gnome-keyring, glib, gjs, mutter, evolution-data-server, gtk3
 , sassc, systemd, gst_all_1, adwaita-icon-theme, gnome-bluetooth, gnome-clocks, gnome-settings-daemon }:
 
@@ -30,7 +30,7 @@ in stdenv.mkDerivation rec {
   buildInputs = [
     systemd caribou
     gsettings-desktop-schemas gnome-keyring glib gcr json-glib accountsservice
-    libcroco libsecret libsoup polkit gdk_pixbuf librsvg
+    libcroco libsecret libsoup polkit gdk-pixbuf librsvg
     clutter networkmanager libstartup_notification telepathy-glib
     libXtst gjs mutter libpulseaudio evolution-data-server
     libical gtk3 gstreamer gdm libcanberra-gtk3 geoclue2
diff --git a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
index 83159c2ad72..5c332c4135c 100644
--- a/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-system-monitor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, gettext, fetchurl, pkgconfig, gtkmm3, libxml2, polkit
 , bash, gtk3, glib, wrapGAppsHook, meson, ninja, python3
-, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
+, gsettings-desktop-schemas, itstool, gnome3, librsvg, gdk-pixbuf, libgtop, systemd }:
 
 stdenv.mkDerivation rec {
   name = "gnome-system-monitor-${version}";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     polkit # for ITS file
   ];
   buildInputs = [
-    bash gtk3 glib libxml2 gtkmm3 libgtop gdk_pixbuf gnome3.adwaita-icon-theme librsvg
+    bash gtk3 glib libxml2 gtkmm3 libgtop gdk-pixbuf gnome3.adwaita-icon-theme librsvg
     gsettings-desktop-schemas systemd
   ];
 
diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
index 3d5cfb85d67..5cd8f249481 100644
--- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
+++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
-, gdk_pixbuf }:
+, gdk-pixbuf }:
 
 let
   pname = "gnome-themes-extra";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-  buildInputs = [ gtk3 librsvg pango atk gtk2 gdk_pixbuf gnome3.adwaita-icon-theme ];
+  buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf gnome3.adwaita-icon-theme ];
 
   postFixup = ''
     gtk-update-icon-cache "$out"/share/icons/HighContrast
diff --git a/pkgs/desktops/gnome-3/core/nautilus/default.nix b/pkgs/desktops/gnome-3/core/nautilus/default.nix
index 2eeb77db0c6..854ce936446 100644
--- a/pkgs/desktops/gnome-3/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/core/nautilus/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, libxml2
 , desktop-file-utils, python3, wrapGAppsHook , gtk3, gnome3, gnome-autoar
 , glib-networking, shared-mime-info, libnotify, libexif, libseccomp , exempi
-, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk_pixbuf
+, librsvg, tracker, tracker-miners, gexiv2, libselinux, gdk-pixbuf
 , substituteAll, bubblewrap, gst_all_1, gsettings-desktop-schemas
 }:
 
@@ -32,7 +32,7 @@ in stdenv.mkDerivation rec {
   preFixup = ''
     gappsWrapperArgs+=(
       # Thumbnailers
-      --prefix XDG_DATA_DIRS : "${gdk_pixbuf}/share"
+      --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"
       --prefix XDG_DATA_DIRS : "${librsvg}/share"
       --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"
     )
diff --git a/pkgs/desktops/gnome-3/core/simple-scan/default.nix b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
index 047e79e14e5..4f57c5247d9 100644
--- a/pkgs/desktops/gnome-3/core/simple-scan/default.nix
+++ b/pkgs/desktops/gnome-3/core/simple-scan/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, itstool, python3, wrapGAppsHook
-, cairo, gdk_pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp
+, cairo, gdk-pixbuf, colord, glib, gtk3, gusb, packagekit, libwebp
 , libxml2, sane-backends, vala, gnome3, gobject-introspection }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cairo gdk_pixbuf colord glib gnome3.adwaita-icon-theme gusb
+    cairo gdk-pixbuf colord glib gnome3.adwaita-icon-theme gusb
     gtk3 libwebp packagekit sane-backends vala
   ];
   nativeBuildInputs = [
diff --git a/pkgs/desktops/gnome-3/core/sushi/default.nix b/pkgs/desktops/gnome-3/core/sushi/default.nix
index c0d5d2be26d..5554dbdfe30 100644
--- a/pkgs/desktops/gnome-3/core/sushi/default.nix
+++ b/pkgs/desktops/gnome-3/core/sushi/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, meson, gettext, gobject-introspection, glib
 , clutter-gtk, clutter-gst, gnome3, gtksourceview, gjs
 , webkitgtk, libmusicbrainz5, icu, wrapGAppsHook, gst_all_1
-, gdk_pixbuf, librsvg, gtk3, harfbuzz, ninja }:
+, gdk-pixbuf, librsvg, gtk3, harfbuzz, ninja }:
 
 stdenv.mkDerivation rec {
   name = "sushi-${version}";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     glib gtk3 gnome3.evince icu harfbuzz
-    clutter-gtk clutter-gst gjs gtksourceview gdk_pixbuf
+    clutter-gtk clutter-gst gjs gtksourceview gdk-pixbuf
     librsvg libmusicbrainz5 webkitgtk
     gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
   ];
diff --git a/pkgs/desktops/gnome-3/core/totem/default.nix b/pkgs/desktops/gnome-3/core/totem/default.nix
index 15417d4ddbb..4953b7ec7a8 100644
--- a/pkgs/desktops/gnome-3/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/core/totem/default.nix
@@ -3,7 +3,7 @@
 , pkgconfig, gtk3, glib, gobject-introspection, totem-pl-parser
 , wrapGAppsHook, itstool, libxml2, vala, gnome3, grilo, grilo-plugins
 , libpeas, adwaita-icon-theme, gnome-desktop, gsettings-desktop-schemas
-, gdk_pixbuf, tracker, nautilus, xvfb_run }:
+, gdk-pixbuf, tracker, nautilus, xvfb_run }:
 
 stdenv.mkDerivation rec {
   name = "totem-${version}";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     gtk3 glib grilo clutter-gtk clutter-gst totem-pl-parser grilo-plugins
     gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
     gst_all_1.gst-plugins-ugly gst_all_1.gst-libav libpeas shared-mime-info
-    gdk_pixbuf libxml2 adwaita-icon-theme gnome-desktop
+    gdk-pixbuf libxml2 adwaita-icon-theme gnome-desktop
     gsettings-desktop-schemas tracker nautilus
     python3Packages.pygobject3 python3Packages.dbus-python # for plug-ins
   ];
diff --git a/pkgs/desktops/gnome-3/games/atomix/default.nix b/pkgs/desktops/gnome-3/games/atomix/default.nix
index 00b3a04a168..c9395166c52 100644
--- a/pkgs/desktops/gnome-3/games/atomix/default.nix
+++ b/pkgs/desktops/gnome-3/games/atomix/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, wrapGAppsHook, python3
-, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk_pixbuf }:
+, gettext, gnome3, glib, gtk3, libgnome-games-support, gdk-pixbuf }:
 
 let
   pname = "atomix";
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig gettext wrapGAppsHook python3 ];
-  buildInputs = [ glib gtk3 gdk_pixbuf libgnome-games-support gnome3.adwaita-icon-theme ];
+  buildInputs = [ glib gtk3 gdk-pixbuf libgnome-games-support gnome3.adwaita-icon-theme ];
 
   postPatch = ''
     chmod +x meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/games/iagno/default.nix b/pkgs/desktops/gnome-3/games/iagno/default.nix
index 540e379210e..86a1bd6485b 100644
--- a/pkgs/desktops/gnome-3/games/iagno/default.nix
+++ b/pkgs/desktops/gnome-3/games/iagno/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook
 , itstool, libcanberra-gtk3, libxml2
 , meson, ninja, python3, vala, desktop-file-utils
 }:
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     meson ninja python3 vala desktop-file-utils
     pkgconfig wrapGAppsHook itstool libxml2
   ];
-  buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg libcanberra-gtk3 ];
+  buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg libcanberra-gtk3 ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
index 18c6f43b3b3..5801c293563 100644
--- a/pkgs/desktops/gnome-3/games/lightsoff/default.nix
+++ b/pkgs/desktops/gnome-3/games/lightsoff/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
+{ stdenv, fetchurl, vala, pkgconfig, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook
 , gettext, itstool, clutter, clutter-gtk, libxml2, appstream-glib
 , meson, ninja, python3 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     vala pkgconfig wrapGAppsHook itstool gettext appstream-glib libxml2
     meson ninja python3
   ];
-  buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk_pixbuf librsvg clutter clutter-gtk ];
+  buildInputs = [ gtk3 gnome3.adwaita-icon-theme gdk-pixbuf librsvg clutter clutter-gtk ];
 
   postPatch = ''
     chmod +x build-aux/meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
index 712f984cbf9..78ed0d9fa68 100644
--- a/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
+++ b/pkgs/desktops/gnome-3/games/quadrapassel/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf
 , librsvg, libcanberra-gtk3, libmanette
 , gettext, itstool, libxml2, clutter, clutter-gtk, wrapGAppsHook
 , meson, ninja, python3, vala, desktop-file-utils
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
     libxml2 itstool gettext wrapGAppsHook
   ];
   buildInputs = [
-    gtk3 gdk_pixbuf librsvg libmanette
+    gtk3 gdk-pixbuf librsvg libmanette
     libcanberra-gtk3 clutter libxml2 clutter-gtk
   ];
 
diff --git a/pkgs/desktops/gnome-3/games/tali/default.nix b/pkgs/desktops/gnome-3/games/tali/default.nix
index 5ec29554b36..d9f3e5fc5ff 100644
--- a/pkgs/desktops/gnome-3/games/tali/default.nix
+++ b/pkgs/desktops/gnome-3/games/tali/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
+{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk-pixbuf
 , librsvg, gettext, itstool, libxml2, wrapGAppsHook
 , meson, ninja, python3, desktop-file-utils
 }:
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     pkgconfig gnome3.adwaita-icon-theme
     libxml2 itstool gettext wrapGAppsHook
   ];
-  buildInputs = [ gtk3 gdk_pixbuf librsvg ];
+  buildInputs = [ gtk3 gdk-pixbuf librsvg ];
 
   postPatch = ''
     chmod +x build-aux/meson_post_install.py
diff --git a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
index fd7f7ef609d..7a54114d2db 100644
--- a/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
+++ b/pkgs/desktops/gnome-3/misc/gnome-tweaks/default.nix
@@ -1,7 +1,7 @@
 { stdenv, meson, ninja, gettext, fetchurl
 , pkgconfig, gtk3, glib, libsoup, gsettings-desktop-schemas
 , itstool, libxml2, python3Packages
-, gnome3, gdk_pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
+, gnome3, gdk-pixbuf, libnotify, gobject-introspection, wrapGAppsHook }:
 
 let
   pname = "gnome-tweaks";
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
   ];
   buildInputs = [
     gtk3 glib gsettings-desktop-schemas
-    gdk_pixbuf gnome3.adwaita-icon-theme
+    gdk-pixbuf gnome3.adwaita-icon-theme
     libnotify gnome3.gnome-shell python3Packages.pygobject3
     libsoup gnome3.gnome-settings-daemon gnome3.nautilus
     gnome3.mutter gnome3.gnome-desktop gobject-introspection
diff --git a/pkgs/desktops/lxde/core/lxpanel/default.nix b/pkgs/desktops/lxde/core/lxpanel/default.nix
index af9570a2c73..a24a33c2e76 100644
--- a/pkgs/desktops/lxde/core/lxpanel/default.nix
+++ b/pkgs/desktops/lxde/core/lxpanel/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext, m4, intltool, libxmlxx, keybinder
-, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk_pixbuf
+, gtk2, libX11, libfm, libwnck, libXmu, libXpm, cairo, gdk-pixbuf
 , menu-cache, lxmenu-data, wirelesstools
 , supportAlsa ? false, alsaLib
 }:
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gettext m4 intltool libxmlxx ];
   buildInputs = [
-    keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk_pixbuf
+    keybinder gtk2 libX11 libfm libwnck libXmu libXpm cairo gdk-pixbuf
     menu-cache lxmenu-data m4 wirelesstools
   ] ++ stdenv.lib.optional supportAlsa alsaLib;
 
diff --git a/pkgs/desktops/mate/caja-dropbox/default.nix b/pkgs/desktops/mate/caja-dropbox/default.nix
index f5b71eba141..597391eb135 100644
--- a/pkgs/desktops/mate/caja-dropbox/default.nix
+++ b/pkgs/desktops/mate/caja-dropbox/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, substituteAll
-, pkgconfig, gobject-introspection, gdk_pixbuf
+, pkgconfig, gobject-introspection, gdk-pixbuf
 , gtk3, mate, python3, dropbox }:
 
 let
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     pkgconfig
     gobject-introspection
-    gdk_pixbuf
+    gdk-pixbuf
     (python3.withPackages (ps: with ps; [
       docutils
       pygobject3
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 3c7b16a6831..a4724049f7c 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk3,
-  gtk_engines, gtk-engine-murrine, gdk_pixbuf, librsvg }:
+  gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }:
 
 stdenv.mkDerivation rec {
   name = "mate-themes-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig intltool gtk3 ];
 
-  buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk_pixbuf librsvg ];
+  buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix
index 5edebb39be4..aaf9986fbb2 100644
--- a/pkgs/desktops/maxx/default.nix
+++ b/pkgs/desktops/maxx/default.nix
@@ -3,7 +3,7 @@
 
 , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm
 , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2
-, gdk_pixbuf, libGL, ncurses5
+, gdk-pixbuf, libGL, ncurses5
 
 , dmidecode, pciutils, usbutils
 }:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm
     libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2
-    gdk_pixbuf libGL ncurses5
+    gdk-pixbuf libGL ncurses5
   ];
 
   buildPhase = ''
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
     maintainers = [ maintainers.gnidorah ];
     platforms = ["x86_64-linux"];
     longDescription = ''
-      A clone of IRIX Interactive Desktop made in agreement with SGI. 
+      A clone of IRIX Interactive Desktop made in agreement with SGI.
       Provides simple and fast retro desktop environment.
     '';
   };
diff --git a/pkgs/desktops/xfce/core/tumbler.nix b/pkgs/desktops/xfce/core/tumbler.nix
index 3e1d2be2b53..9087d3a0255 100644
--- a/pkgs/desktops/xfce/core/tumbler.nix
+++ b/pkgs/desktops/xfce/core/tumbler.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk_pixbuf, curl, freetype
+{ stdenv, fetchurl, pkgconfig, intltool, dbus-glib, gdk-pixbuf, curl, freetype
 , libgsf, poppler, bzip2 }:
 let
   p_name  = "tumbler";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    intltool dbus-glib gdk_pixbuf curl freetype
+    intltool dbus-glib gdk-pixbuf curl freetype
     poppler libgsf bzip2
   ];
 
diff --git a/pkgs/desktops/xfce4-14/thunar/default.nix b/pkgs/desktops/xfce4-14/thunar/default.nix
index e559505aca6..27fe256490a 100644
--- a/pkgs/desktops/xfce4-14/thunar/default.nix
+++ b/pkgs/desktops/xfce4-14/thunar/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, docbook_xsl, exo, gdk_pixbuf, gtk3, libgudev ? null
+{ mkXfceDerivation, docbook_xsl, exo, gdk-pixbuf, gtk3, libgudev ? null
 , libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }:
 
 mkXfceDerivation rec {
@@ -19,7 +19,7 @@ mkXfceDerivation rec {
 
   buildInputs = [
     exo
-    gdk_pixbuf
+    gdk-pixbuf
     gtk3
     libgudev
     libnotify
diff --git a/pkgs/desktops/xfce4-14/tumbler/default.nix b/pkgs/desktops/xfce4-14/tumbler/default.nix
index e67c7f1e298..81cc0922ff3 100644
--- a/pkgs/desktops/xfce4-14/tumbler/default.nix
+++ b/pkgs/desktops/xfce4-14/tumbler/default.nix
@@ -1,4 +1,4 @@
-{ mkXfceDerivation, gdk_pixbuf ? null, ffmpegthumbnailer ? null, libgsf ? null
+{ mkXfceDerivation, gdk-pixbuf ? null, ffmpegthumbnailer ? null, libgsf ? null
 , poppler ? null }:
 
 # TODO: add libopenraw
@@ -11,5 +11,5 @@ mkXfceDerivation rec {
 
   sha256 = "1k579g8dmcfpw1vakspv6k2qkr1y1axyr8cbd0fqjhqdj4pis81i";
 
-  buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ];
+  buildInputs = [ gdk-pixbuf ffmpegthumbnailer libgsf poppler ];
 }
diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix
index 2df5d16dbac..5d151e5fa21 100644
--- a/pkgs/development/arduino/arduino-core/default.nix
+++ b/pkgs/development/arduino/arduino-core/default.nix
@@ -3,7 +3,7 @@
 , withGui ? false, gtk2 ? null, withTeensyduino ? false
   /* Packages needed for Teensyduino */
 , upx, fontconfig, xorg, gcc
-, atk, glib, pango, gdk_pixbuf, libpng12, expat, freetype,
+, atk, glib, pango, gdk-pixbuf, libpng12, expat, freetype,
 }:
 
 assert withGui -> gtk2 != null;
@@ -36,7 +36,7 @@ let
     fontconfig
     freetype
     gcc.cc.lib
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gtk2
     libpng12
@@ -115,7 +115,7 @@ stdenv.mkDerivation rec {
     substituteInPlace build/build.xml --replace "get src" "get error"
 
     cd ./arduino-core && ant
-    cd ../build && ant 
+    cd ../build && ant
     cd ..
   '';
 
diff --git a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
index 8e8b157aa22..a837c6f1e85 100644
--- a/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ b/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
@@ -17,7 +17,7 @@ sourcePerArch:
 , cairo
 , alsaLib
 , atk
-, gdk_pixbuf
+, gdk-pixbuf
 , zlib
 , elfutils
 }:
@@ -35,7 +35,7 @@ let
 
   libraries = [
     stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL
-    xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf
+    xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf
     atk zlib elfutils
   ] ++ (stdenv.lib.optionals swingSupport [
     xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 6a18c05f38e..5b9e9010ef0 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, makeWrapper, fetchurl, requireFile, perl, ncurses5, expat, python27, zlib
 , gcc48, gcc49, gcc5, gcc6, gcc7
-, xorg, gtk2, gdk_pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
+, xorg, gtk2, gdk-pixbuf, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
 , addOpenGLRunpath
 }:
 
@@ -41,7 +41,7 @@ let
       outputs = [ "out" "lib" "doc" ];
 
       nativeBuildInputs = [ perl makeWrapper addOpenGLRunpath ];
-      buildInputs = [ gdk_pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
+      buildInputs = [ gdk-pixbuf ]; # To get $GDK_PIXBUF_MODULE_FILE via setup-hook
       runtimeDependencies = [
         ncurses5 expat python zlib glibc
         xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix
index 0f9a1a94bcc..405aa8aa3ca 100644
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, glib, git,
   rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
-  pango, cairo, gtk2, gdk_pixbuf, gtkglext,
+  pango, cairo, gtk2, gdk-pixbuf, gtkglext,
   mesa, xorg, openssl, unzip }:
 
 stdenv.mkDerivation rec {
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper
-    libX11 pango cairo gtk2 gdk_pixbuf gtkglext
+    libX11 pango cairo gtk2 gdk-pixbuf gtkglext
     mesa libXmu libXt libICE libSM openssl unzip ];
 
   buildPhase = ''
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     # will work only on the known libraries. There does not seem
     # to be a generic solution here.
     find $(echo ${stdenv.lib.makeLibraryPath (with xorg; [
-        glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext
+        glib libX11 pango cairo gtk2 gdk-pixbuf gtkglext
         mesa libXmu libXt libICE libSM ])} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
 
     (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
     cp ./factor $out/bin
     wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
       "${stdenv.lib.makeLibraryPath (with xorg; [ glib
-        libX11 pango cairo gtk2 gdk_pixbuf gtkglext
+        libX11 pango cairo gtk2 gdk-pixbuf gtkglext
         mesa libXmu libXt libICE libSM openssl])}"
 
     sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 74ca246deb0..3fe72e6b505 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper
-, fpc, gtk2, glib, pango, atk, gdk_pixbuf
+, fpc, gtk2, glib, pango, atk, gdk-pixbuf
 , libXi, xorgproto, libX11, libXext
 }:
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     fpc gtk2 glib libXi xorgproto
     libX11 libXext pango atk
-    stdenv.cc makeWrapper gdk_pixbuf
+    stdenv.cc makeWrapper gdk-pixbuf
   ];
 
   makeFlags = [
diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix
index 08e3ec4f445..d407fb46b9b 100644
--- a/pkgs/development/compilers/jetbrains-jdk/default.nix
+++ b/pkgs/development/compilers/jetbrains-jdk/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt
 , libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo
-, gdk_pixbuf, atk, zlib }:
+, gdk-pixbuf, atk, zlib }:
 
 # TODO: Investigate building from source instead of patching binaries.
 # TODO: Binary patching for not just x86_64-linux but also x86_64-darwin i686-linux
@@ -38,7 +38,7 @@ let drv = stdenv.mkDerivation rec {
 
   rpath = lib.makeLibraryPath ([
     stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
-    alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib
+    alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk zlib
     (placeholder "out")
   ] ++ (with xorg; [
     libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm
diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
index ea6b9d2a9fe..e80d81dc5a0 100644
--- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
@@ -32,7 +32,7 @@
 , cairo
 , alsaLib
 , atk
-, gdk_pixbuf
+, gdk-pixbuf
 , setJavaClassPath
 }:
 
@@ -183,7 +183,7 @@ let result = stdenv.mkDerivation rec {
    * libXt is only needed on amd64
    */
   libraries =
-    [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++
+    [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk-pixbuf atk] ++
     (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []);
 
   rpath = stdenv.lib.strings.makeLibraryPath libraries;
diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix
index fb1798ab819..cc42ee1dd3f 100644
--- a/pkgs/development/compilers/zulu/8.nix
+++ b/pkgs/development/compilers/zulu/8.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
 , zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
-, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg
+, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg
 , swingSupport ? true }:
 
 let
@@ -17,7 +17,7 @@ let
   libraries = [
     stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
     xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
-    gnome2.gtk cairo gdk_pixbuf atk
+    gnome2.gtk cairo gdk-pixbuf atk
   ] ++ (lib.optionals swingSupport (with xorg; [
     xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
     xorg.libXt xorg.libXrender stdenv.cc.cc
diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix
index 908aa29e178..a43992164d2 100644
--- a/pkgs/development/compilers/zulu/default.nix
+++ b/pkgs/development/compilers/zulu/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath
 , zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib
-, fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg, zlib
+, fontconfig, freetype, gnome2, cairo, gdk-pixbuf, atk, xorg, zlib
 , swingSupport ? true }:
 
 let
@@ -17,7 +17,7 @@ let
   libraries = [
     stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL
     xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango
-    gnome2.gtk cairo gdk_pixbuf atk zlib
+    gnome2.gtk cairo gdk-pixbuf atk zlib
   ] ++ (lib.optionals swingSupport (with xorg; [
     xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp
     xorg.libXt xorg.libXrender stdenv.cc.cc
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 45ad58819c3..c9395ea6df7 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, substituteAll, pkgconfig, gettext, gtk3, glib
 , gtk-doc, libarchive, gobject-introspection, libxslt, pngquant
 , sqlite, libsoup, attr, acl, docbook_xsl, docbook_xml_dtd_42
-, libuuid, json-glib, meson, gperf, ninja, gdk_pixbuf
+, libuuid, json-glib, meson, gperf, ninja, gdk-pixbuf
 }:
 stdenv.mkDerivation rec {
   name = "appstream-glib-0.7.15";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib gettext sqlite libsoup
     attr acl libuuid json-glib
-    libarchive gperf gdk_pixbuf
+    libarchive gperf gdk-pixbuf
   ];
   propagatedBuildInputs = [ gtk3 ];
 
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 9577bfe9e8a..3c88327c790 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk_pixbuf }:
+{ fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl, gnome3, gdk-pixbuf }:
 
 let
   pname = "clutter-gst";
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
     sha256 = "17czmpl92dzi4h3rn5rishk015yi3jwiw29zv8qan94xcmnbssgy";
   };
 
-  propagatedBuildInputs = [ clutter gtk3 glib cogl gdk_pixbuf ];
+  propagatedBuildInputs = [ clutter gtk3 glib cogl gdk-pixbuf ];
   nativeBuildInputs = [ pkgconfig ];
 
   postBuild = "rm -rf $out/share/gtk-doc";
diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix
index 8eacbb4f855..4700d9e2418 100644
--- a/pkgs/development/libraries/cogl/default.nix
+++ b/pkgs/development/libraries/cogl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libGL, glib, gdk-pixbuf, xorg, libintl
 , pangoSupport ? true, pango, cairo, gobject-introspection, wayland, gnome3
 , mesa
 , gstreamerSupport ? true, gst_all_1 }:
@@ -44,7 +44,7 @@ in stdenv.mkDerivation rec {
     ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "--enable-gles1" "--enable-gles2" ];
 
   propagatedBuildInputs = with xorg; [
-      glib gdk_pixbuf gobject-introspection wayland mesa
+      glib gdk-pixbuf gobject-introspection wayland mesa
       libGL libXrandr libXfixes libXcomposite libXdamage
     ]
     ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer
diff --git a/pkgs/development/libraries/gcr/default.nix b/pkgs/development/libraries/gcr/default.nix
index 218a44215c6..dcb4df1419e 100644
--- a/pkgs/development/libraries/gcr/default.nix
+++ b/pkgs/development/libraries/gcr/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnupg, p11-kit, glib
-, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk_pixbuf, atk
+, libgcrypt, libtasn1, dbus-glib, gtk3, pango, gdk-pixbuf, atk
 , gobject-introspection, makeWrapper, libxslt, vala, gnome3
 , python2 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   buildInputs = let
     gpg = gnupg.override { guiSupport = false; }; # prevent build cycle with pinentry_gnome
   in [
-    gpg libgcrypt libtasn1 dbus-glib pango gdk_pixbuf atk
+    gpg libgcrypt libtasn1 dbus-glib pango gdk-pixbuf atk
   ];
 
   propagatedBuildInputs = [ glib gtk3 p11-kit ];
diff --git a/pkgs/development/libraries/gdk-pixbuf/default.nix b/pkgs/development/libraries/gdk-pixbuf/default.nix
index 48c232c122b..59e7808057f 100644
--- a/pkgs/development/libraries/gdk-pixbuf/default.nix
+++ b/pkgs/development/libraries/gdk-pixbuf/default.nix
@@ -83,7 +83,6 @@ in stdenv.mkDerivation rec {
   passthru = {
     updateScript = gnome3.updateScript {
       packageName = pname;
-      attrPath = "gdk_pixbuf";
     };
 
     # gdk_pixbuf_moduledir variable from gdk-pixbuf-2.0.pc
diff --git a/pkgs/development/libraries/geis/default.nix b/pkgs/development/libraries/geis/default.nix
index e1f243f8fd3..4b9f67b7aaf 100644
--- a/pkgs/development/libraries/geis/default.nix
+++ b/pkgs/development/libraries/geis/default.nix
@@ -6,7 +6,7 @@
 , dbus
 , evemu
 , frame
-, gdk_pixbuf
+, gdk-pixbuf
 , gobject-introspection
 , grail
 , gtk3
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     [ pygobject3  ];
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook python3Packages.wrapPython];
-  buildInputs = [ atk dbus evemu frame gdk_pixbuf gobject-introspection grail
+  buildInputs = [ atk dbus evemu frame gdk-pixbuf gobject-introspection grail
     gtk3 libX11 libXext libXi libXtst pango python3Packages.python xorgserver
   ];
 
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index 466720176a9..cc2037791e0 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk_pixbuf
+{ stdenv, fetchFromGitLab, intltool, meson, ninja, pkgconfig, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, json-glib, libsoup, libnotify, gdk-pixbuf
 , modemmanager, avahi, glib-networking, python3, wrapGAppsHook, gobject-introspection, vala
 , withDemoAgent ? false
 }:
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib json-glib libsoup avahi
   ] ++ optionals withDemoAgent [
-    libnotify gdk_pixbuf
+    libnotify gdk-pixbuf
   ] ++ optionals (!stdenv.isDarwin) [ modemmanager ];
 
   propagatedBuildInputs = [ glib glib-networking ];
diff --git a/pkgs/development/libraries/gom/default.nix b/pkgs/development/libraries/gom/default.nix
index 5694c50e90a..9a947c3ff82 100644
--- a/pkgs/development/libraries/gom/default.nix
+++ b/pkgs/development/libraries/gom/default.nix
@@ -7,7 +7,7 @@
 , glib
 , python3
 , sqlite
-, gdk_pixbuf
+, gdk-pixbuf
 , gnome3
 , gobject-introspection
 }:
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     sqlite
     python3.pkgs.pygobject3
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index b76142c9d86..7ef9fbcc44b 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -2,7 +2,7 @@
 , gst-plugins-base, orc, bzip2, gettext
 , libv4l, libdv, libavc1394, libiec61883
 , libvpx, speex, flac, taglib, libshout
-, cairo, gdk_pixbuf, aalib, libcaca
+, cairo, gdk-pixbuf, aalib, libcaca
 , libsoup, libpulseaudio, libintl
 , darwin, lame, mpg123, twolame
 , gtkSupport ? false, gtk3 ? null
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     gst-plugins-base orc bzip2
     libdv libvpx speex flac taglib
-    cairo gdk_pixbuf aalib libcaca
+    cairo gdk-pixbuf aalib libcaca
     libsoup libshout lame mpg123 twolame libintl
     libXdamage
     libXext
diff --git a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
index 7ecb6c34b43..2b78d4daaf3 100644
--- a/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
+++ b/pkgs/development/libraries/gstreamer/legacy/gst-plugins-good/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, lib, pkgconfig, gst-plugins-base, aalib, cairo
 , flac, libjpeg, speex, libpng, libdv, libcaca, libvpx
-, taglib, libpulseaudio, gdk_pixbuf, orc
+, taglib, libpulseaudio, gdk-pixbuf, orc
 , glib, gstreamer, bzip2, libsoup, libshout, ncurses, libintl
 , # Whether to build no plugins that have external dependencies
   # (except the PulseAudio plugin).
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     ++ lib.optional stdenv.isLinux libpulseaudio
     ++ lib.optionals (!minimalDeps)
       [ aalib libcaca cairo libdv flac libjpeg libpng speex
-        taglib bzip2 libvpx gdk_pixbuf orc libsoup libshout ];
+        taglib bzip2 libvpx gdk-pixbuf orc libsoup libshout ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index 8dad69eb998..886f0aefafb 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -1,5 +1,5 @@
 { config, stdenv, fetchurl, pkgconfig, gettext, glib, atk, pango, cairo, perl, xorg
-, gdk_pixbuf, xlibsWrapper, gobject-introspection
+, gdk-pixbuf, xlibsWrapper, gobject-introspection
 , xineramaSupport ? stdenv.isLinux
 , cupsSupport ? config.gtk2.cups or stdenv.isLinux, cups ? null
 , gdktarget ? if stdenv.isDarwin then "quartz" else "x11"
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ];
 
   propagatedBuildInputs = with xorg;
-    [ glib cairo pango gdk_pixbuf atk ]
+    [ glib cairo pango gdk-pixbuf atk ]
     ++ optionals (stdenv.isLinux || stdenv.isDarwin) [
          libXrandr libXrender libXcomposite libXi libXcursor
        ]
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 8c3df083087..074e4e29d51 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -13,7 +13,7 @@
 , glib
 , cairo
 , pango
-, gdk_pixbuf
+, gdk-pixbuf
 , atk
 , at-spi2-atk
 , gobject-introspection
@@ -121,7 +121,7 @@ stdenv.mkDerivation rec {
     cairo
     expat
     fribidi
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gsettings-desktop-schemas
     libICE
diff --git a/pkgs/development/libraries/gtkd/default.nix b/pkgs/development/libraries/gtkd/default.nix
index 1c238a8424c..c2f05b51a65 100644
--- a/pkgs/development/libraries/gtkd/default.nix
+++ b/pkgs/development/libraries/gtkd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, atk, cairo, dmd, gdk_pixbuf, gnome3, gst_all_1, librsvg
+{ stdenv, fetchzip, atk, cairo, dmd, gdk-pixbuf, gnome3, gst_all_1, librsvg
 , glib, gtk3, gtksourceview, libgda, libpeas, pango, pkgconfig, which, vte }:
 
 let
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ dmd pkgconfig which ];
   propagatedBuildInputs = [
-    atk cairo gdk_pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview
+    atk cairo gdk-pixbuf glib gstreamer gst-plugins-base gtk3 gtksourceview
     libgda libpeas librsvg pango vte
   ];
 
@@ -28,8 +28,8 @@ in stdenv.mkDerivation rec {
       --replace libcairo.so.2 ${cairo}/lib/libcairo.so.2 \
       --replace libcairo.dylib ${cairo}/lib/libcairo.dylib
     substituteInPlace generated/gtkd/gdkpixbuf/c/functions.d \
-      --replace libgdk_pixbuf-2.0.so.0 ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \
-      --replace libgdk_pixbuf-2.0.0.dylib ${gdk_pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib
+      --replace libgdk_pixbuf-2.0.so.0 ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.so.0 \
+      --replace libgdk_pixbuf-2.0.0.dylib ${gdk-pixbuf}/lib/libgdk_pixbuf-2.0.0.dylib
     substituteInPlace generated/gtkd/atk/c/functions.d \
       --replace libatk-1.0.so.0 ${atk}/lib/libatk-1.0.so.0 \
       --replace libatk-1.0.0.dylib ${atk}/lib/libatk-1.0.0.dylib
diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix
index 0dc9e8bd892..c2acd234893 100644
--- a/pkgs/development/libraries/java/swt/default.nix
+++ b/pkgs/development/libraries/java/swt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2
 , libXt, libXtst, libXi, libGLU_combined, webkitgtk, libsoup, xorg
-, pango, gdk_pixbuf, glib
+, pango, gdk-pixbuf, glib
 }:
 
 let
@@ -38,7 +38,7 @@ in stdenv.mkDerivation rec {
   nativeBuildInputs = [ unzip pkgconfig ];
   buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkitgtk libsoup ];
 
-  NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++
+  NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk-pixbuf glib ]) ++
     [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ];
 
   buildPhase = ''
diff --git a/pkgs/development/libraries/lasem/default.nix b/pkgs/development/libraries/lasem/default.nix
index b5e62b960c0..5e00ce1037f 100644
--- a/pkgs/development/libraries/lasem/default.nix
+++ b/pkgs/development/libraries/lasem/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk_pixbuf
+{ fetchurl, stdenv, pkgconfig, intltool, gobject-introspection, glib, gdk-pixbuf
 , libxml2, cairo, pango, gnome3 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig intltool gobject-introspection ];
 
   propagatedBuildInputs = [
-    glib gdk_pixbuf libxml2 cairo pango
+    glib gdk-pixbuf libxml2 cairo pango
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index 9e7d608b512..ecba18cd58c 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, cmake, alsaLib, atk, cairo, cups, dbus, expat, fontconfig
-, GConf, gdk_pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
+, GConf, gdk-pixbuf, glib, gtk2, libX11, libxcb, libXcomposite, libXcursor
 , libXdamage, libXext, libXfixes, libXi, libXrandr, libXrender, libXScrnSaver
 , libXtst, nspr, nss, pango, libpulseaudio, systemd }:
 
 let
   libPath =
     stdenv.lib.makeLibraryPath [
-      alsaLib atk cairo cups dbus expat fontconfig GConf gdk_pixbuf glib gtk2
+      alsaLib atk cairo cups dbus expat fontconfig GConf gdk-pixbuf glib gtk2
       libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi
       libXrandr libXrender libXScrnSaver libXtst nspr nss pango libpulseaudio
       systemd
diff --git a/pkgs/development/libraries/libgpod/default.nix b/pkgs/development/libraries/libgpod/default.nix
index b77690bd159..d561ebcd7af 100644
--- a/pkgs/development/libraries/libgpod/default.nix
+++ b/pkgs/development/libraries/libgpod/default.nix
@@ -1,5 +1,5 @@
 {stdenv, lib, fetchurl, gettext, perlPackages, intltool, pkgconfig, glib,
-  libxml2, sqlite, zlib, sg3_utils, gdk_pixbuf, taglib,
+  libxml2, sqlite, zlib, sg3_utils, gdk-pixbuf, taglib,
   libimobiledevice, pythonPackages, mutagen,
   monoSupport ? false, mono, gtk-sharp-2_0
 }:
@@ -23,7 +23,7 @@ in stdenv.mkDerivation rec {
   dontStrip = true;
 
   propagatedBuildInputs = [ glib libxml2 sqlite zlib sg3_utils
-    gdk_pixbuf taglib libimobiledevice python pygobject2 mutagen ];
+    gdk-pixbuf taglib libimobiledevice python pygobject2 mutagen ];
 
   nativeBuildInputs = [ gettext intltool pkgconfig ]
     ++ (with perlPackages; [ perl XMLParser ])
diff --git a/pkgs/development/libraries/libgsf/default.nix b/pkgs/development/libraries/libgsf/default.nix
index f2d31cf1676..89a72bba872 100644
--- a/pkgs/development/libraries/libgsf/default.nix
+++ b/pkgs/development/libraries/libgsf/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, intltool, gettext, glib, libxml2, zlib, bzip2
-, python, perl, gdk_pixbuf, libiconv, libintl, gnome3 }:
+, python, perl, gdk-pixbuf, libiconv, libintl, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libgsf";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gettext bzip2 zlib python ];
   checkInputs = [ perl ];
 
-  propagatedBuildInputs = [ libxml2 glib gdk_pixbuf libiconv ];
+  propagatedBuildInputs = [ libxml2 glib gdk-pixbuf libiconv ];
 
   outputs = [ "out" "dev" ];
 
diff --git a/pkgs/development/libraries/libmediaart/default.nix b/pkgs/development/libraries/libmediaart/default.nix
index 64d2cc7577c..569c567e928 100644
--- a/pkgs/development/libraries/libmediaart/default.nix
+++ b/pkgs/development/libraries/libmediaart/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk_pixbuf, gobject-introspection, gnome3 }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gdk-pixbuf, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libmediaart";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig vala gtk-doc docbook_xsl docbook_xml_dtd_412 gobject-introspection ];
-  buildInputs = [ glib gdk_pixbuf ];
+  buildInputs = [ glib gdk-pixbuf ];
 
   # FIXME: Turn on again when https://github.com/NixOS/nixpkgs/issues/53701
   # is fixed on master.
diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index ddadb3cd97b..be1daa0505a 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, meson, ninja, pkgconfig, fetchpatch
-, glib, gdk_pixbuf, gobject-introspection, gnome3 }:
+, glib, gdk-pixbuf, gobject-introspection, gnome3 }:
 
 stdenv.mkDerivation rec {
   pname = "libnotify";
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection ];
-  buildInputs = [ glib gdk_pixbuf ];
+  buildInputs = [ glib gdk-pixbuf ];
 
   passthru = {
     updateScript = gnome3.updateScript {
diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 0cbd60409b4..a911524a9ac 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, pango, cairo, libxml2, libgsf
+{ lib, stdenv, fetchurl, pkgconfig, glib, gdk-pixbuf, pango, cairo, libxml2, libgsf
 , bzip2, libcroco, libintl, darwin, rustc, cargo, gnome3
 , withGTK ? false, gtk3 ? null
 , vala, gobject-introspection }:
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintl ];
 
-  propagatedBuildInputs = [ glib gdk_pixbuf cairo ] ++ lib.optional withGTK gtk3;
+  propagatedBuildInputs = [ glib gdk-pixbuf cairo ] ++ lib.optional withGTK gtk3;
 
   nativeBuildInputs = [ pkgconfig rustc cargo vala gobject-introspection ]
     ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
          -i gdk-pixbuf-loader/Makefile
 
     # Fix thumbnailer path
-    sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk_pixbuf}/bin\1#g" \
+    sed -e "s#@bindir@\(/gdk-pixbuf-thumbnailer\)#${gdk-pixbuf}/bin\1#g" \
         -i gdk-pixbuf-loader/librsvg.thumbnailer.in
   '';
 
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
   # Merge gdkpixbuf and librsvg loaders
   postInstall = ''
     mv $GDK_PIXBUF/loaders.cache $GDK_PIXBUF/loaders.cache.tmp
-    cat ${gdk_pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache
+    cat ${gdk-pixbuf.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache $GDK_PIXBUF/loaders.cache.tmp > $GDK_PIXBUF/loaders.cache
     rm $GDK_PIXBUF/loaders.cache.tmp
   '';
 
diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index afd2a01e722..de6457db98b 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -6,7 +6,7 @@
 , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base
 , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin)
 , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms
-, flashplayerFix ? false, gdk_pixbuf
+, flashplayerFix ? false, gdk-pixbuf
 , gtkStyle ? stdenv.hostPlatform == stdenv.buildPlatform, gtk2
 , gnomeStyle ? false, libgnomeui, GConf, gnome_vfs
 , developerBuild ? false
@@ -188,7 +188,7 @@ stdenv.mkDerivation rec {
     [ cups # Qt dlopen's libcups instead of linking to it
       postgresql sqlite libjpeg libmng libtiff icu ]
     ++ lib.optionals (mysql != null) [ mysql.connector-c ]
-    ++ lib.optionals gtkStyle [ gtk2 gdk_pixbuf ]
+    ++ lib.optionals gtkStyle [ gtk2 gdk-pixbuf ]
     ++ lib.optionals stdenv.isDarwin [ ApplicationServices OpenGL Cocoa AGL libcxx libobjc ];
 
   nativeBuildInputs = [ perl pkgconfig which ];
diff --git a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
index 22215b8da0d..cd9d9f2d150 100644
--- a/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-cairo/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk_pixbuf, gtk2, pango }:
+{stdenv, fetchurl, automake, ocaml, autoconf, gnum4, pkgconfig, freetype, lablgtk, unzip, cairo, findlib, gdk-pixbuf, gtk2, pango }:
 
 let
   pname = "ocaml-cairo";
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ocaml automake gnum4 autoconf unzip
-                  findlib freetype lablgtk cairo gdk_pixbuf gtk2 pango ];
+                  findlib freetype lablgtk cairo gdk-pixbuf gtk2 pango ];
 
   createFindlibDestdir = true;
 
diff --git a/pkgs/development/python-modules/cairocffi/0_9.nix b/pkgs/development/python-modules/cairocffi/0_9.nix
index 19a469dad26..bd7bde42901 100644
--- a/pkgs/development/python-modules/cairocffi/0_9.nix
+++ b/pkgs/development/python-modules/cairocffi/0_9.nix
@@ -1,4 +1,4 @@
-# FIXME: make gdk_pixbuf dependency optional
+# FIXME: make gdk-pixbuf dependency optional
 { stdenv
 , buildPythonPackage
 , pythonOlder
@@ -15,7 +15,7 @@
 , withXcffib ? false, xcffib
 , python
 , glib
-, gdk_pixbuf
+, gdk-pixbuf
 }@args:
 
 import ./generic.nix ({
diff --git a/pkgs/development/python-modules/cairocffi/default.nix b/pkgs/development/python-modules/cairocffi/default.nix
index 528c845c07e..f91b33d2010 100644
--- a/pkgs/development/python-modules/cairocffi/default.nix
+++ b/pkgs/development/python-modules/cairocffi/default.nix
@@ -1,4 +1,4 @@
-# FIXME: make gdk_pixbuf dependency optional
+# FIXME: make gdk-pixbuf dependency optional
 { stdenv
 , buildPythonPackage
 , pythonOlder
@@ -15,7 +15,7 @@
 , withXcffib ? false, xcffib
 , python
 , glib
-, gdk_pixbuf
+, gdk-pixbuf
 }@args:
 
 import ./generic.nix ({
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
index 862f7bd4bf7..a1018e6eb33 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths-0.9.patch
@@ -3,7 +3,7 @@ Author: Alexander V. Nikolaev <avn@avnik.info>
 Date:   Sat Feb 6 08:09:06 2016 +0200
 
     Patch dlopen() to allow direct paths to all required libs
-    
+
     This patch is NixOS specific
 
 diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
@@ -13,15 +13,15 @@ index 718aa7f..1a1dcff 100644
 @@ -27,20 +27,22 @@ VERSION = '0.7.2'
  version = '1.10.0'
  version_info = (1, 10, 0)
- 
+
 +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
 +_LIBS = {
 +    'cairo': '@cairo@/lib/libcairo@ext@',
 +    'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
 +    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
-+    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
++    'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
 +}
- 
+
 -def dlopen(ffi, *names):
 +def dlopen(ffi, name, *names):
      """Try various names for the same library, for different platforms."""
@@ -42,6 +42,6 @@ index 718aa7f..1a1dcff 100644
 +        if lib:
 +            return lib
 +    raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
- 
- 
+
+
  cairo = dlopen(ffi, 'cairo', 'cairo-2')
diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
index d42b8bcce48..9fd2832b323 100644
--- a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
@@ -3,7 +3,7 @@ Author: Alexander V. Nikolaev <avn@avnik.info>
 Date:   Sat Feb 6 08:09:06 2016 +0200
 
     Patch dlopen() to allow direct paths to all required libs
-    
+
     This patch is NixOS specific
 
 diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
@@ -13,15 +13,15 @@ index 6061973..3538a58 100644
 @@ -21,19 +21,22 @@ VERSION = __version__ = (Path(__file__).parent / 'VERSION').read_text().strip()
  version = '1.16.0'
  version_info = (1, 16, 0)
- 
+
 +# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
 +_LIBS = {
 +    'cairo': '@cairo@/lib/libcairo@ext@',
 +    'glib-2.0': '@glib@/lib/libglib-2.0@ext@',
 +    'gobject-2.0': '@glib@/lib/libgobject-2.0@ext@',
-+    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
++    'gdk-pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0@ext@',
 +}
- 
+
 -def dlopen(ffi, *names):
 +def dlopen(ffi, name, *names):
      """Try various names for the same library, for different platforms."""
@@ -41,6 +41,6 @@ index 6061973..3538a58 100644
 +        if lib:
 +            return lib
 +    raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
- 
- 
+
+
  cairo = dlopen(ffi, 'cairo', 'cairo-2', 'cairo-gobject-2', 'cairo.so.2')
diff --git a/pkgs/development/python-modules/cairocffi/generic.nix b/pkgs/development/python-modules/cairocffi/generic.nix
index 4fa5cc466c3..cf1618a865b 100644
--- a/pkgs/development/python-modules/cairocffi/generic.nix
+++ b/pkgs/development/python-modules/cairocffi/generic.nix
@@ -31,13 +31,13 @@ buildPythonPackage rec {
   '';
 
   patches = [
-    # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0
+    # OSError: dlopen() failed to load a library: gdk-pixbuf-2.0 / gdk-pixbuf-2.0-0
     (substituteAll {
       src = dlopen_patch;
       ext = stdenv.hostPlatform.extensions.sharedLibrary;
       cairo = cairo.out;
       glib = glib.out;
-      gdk_pixbuf = gdk_pixbuf.out;
+      gdk_pixbuf = gdk-pixbuf.out;
     })
     ./fix_test_scaled_font.patch
   ];
diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
index 1b00e1264ff..b3093390e3b 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -7,7 +7,7 @@
 , pytest
 , glibc
 , gtk2-x11
-, gdk_pixbuf
+, gdk-pixbuf
 }:
 
 buildPythonPackage rec {
@@ -42,7 +42,7 @@ buildPythonPackage rec {
             elif name == 'gdk-x11-2.0':
                 path = '${gtk2-x11}/lib/libgdk-x11-2.0${ext}'
             elif name == 'gdk_pixbuf-2.0':
-                path = '${gdk_pixbuf}/lib/libgdk_pixbuf-2.0${ext}'
+                path = '${gdk-pixbuf}/lib/libgdk_pixbuf-2.0${ext}'
             if path is not None:
                 return ctypes.cdll.LoadLibrary(path)
         raise Exception("Could not load library {}".format(names))
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index eb136d4c243..4e9bd0538a9 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -22,7 +22,7 @@
 , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
 , msgpack, qt59, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
-, cairo, re2, rake, gobject-introspection, gdk_pixbuf, zeromq, czmq, graphicsmagick, libcxx
+, cairo, re2, rake, gobject-introspection, gdk-pixbuf, zeromq, czmq, graphicsmagick, libcxx
 , file, libvirt, glib, vips, taglib, libopus, linux-pam, libidn, protobuf, fribidi, harfbuzz
 , bison, flex, pango, python3, patchelf
 , libselinux ? null, libsepol ? null
@@ -159,7 +159,7 @@ in
 
   gdk_pixbuf2 = attrs: {
     nativeBuildInputs = [ pkgconfig ];
-    buildInputs = [ rake gdk_pixbuf ];
+    buildInputs = [ rake gdk-pixbuf ];
   };
 
   gpgme = attrs: {
@@ -255,7 +255,7 @@ in
       pkgconfig
       cairo
       pango
-      gdk_pixbuf
+      gdk-pixbuf
       libxml2
       python3
     ];
diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix
index 099e31b8d62..57beec8f171 100644
--- a/pkgs/development/tools/node-webkit/nw12.nix
+++ b/pkgs/development/tools/node-webkit/nw12.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
 , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
+, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
 , libnotify}:
 let
   bits = if stdenv.hostPlatform.system == "x86_64-linux" then "x64"
@@ -9,7 +9,7 @@ let
   nwEnv = buildEnv {
     name = "nwjs-env";
     paths = [
-      xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf
+      xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk-pixbuf
       freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
       xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
       xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr libcap
diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix
index 211934080c8..96516bfda48 100644
--- a/pkgs/development/tools/nwjs/default.nix
+++ b/pkgs/development/tools/nwjs/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildEnv, makeWrapper
 
 , xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
+, gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap
 , libnotify
 , ffmpeg, libxcb, cups
 , sqlite, udev
@@ -15,7 +15,7 @@ let
   nwEnv = buildEnv {
     name = "nwjs-env";
     paths = [
-      xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk_pixbuf
+      xorg.libX11 xorg.libXrender glib /*gtk2*/ gtk3 atk pango cairo gdk-pixbuf
       freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
       xorg.libXext xorg.libXfixes nss nspr gconf expat dbus
       xorg.libXtst xorg.libXi xorg.libXcursor xorg.libXrandr
diff --git a/pkgs/development/tools/react-native-debugger/default.nix b/pkgs/development/tools/react-native-debugger/default.nix
index 97e92c3472c..939febae693 100644
--- a/pkgs/development/tools/react-native-debugger/default.nix
+++ b/pkgs/development/tools/react-native-debugger/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, cairo, xorg, gdk_pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib
+{ stdenv, fetchurl, unzip, cairo, xorg, gdk-pixbuf, fontconfig, pango, gnome2, atk, gtk2, glib
 , freetype, dbus, nss, nspr, alsaLib, cups, expat, udev, makeDesktopItem
 }:
 
@@ -6,7 +6,7 @@ let
   rpath = stdenv.lib.makeLibraryPath [
     cairo
     stdenv.cc.cc
-    gdk_pixbuf
+    gdk-pixbuf
     fontconfig
     pango
     atk
diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix
index 50aad7a013a..178bfc2dc17 100644
--- a/pkgs/development/tools/selenium/chromedriver/default.nix
+++ b/pkgs/development/tools/selenium/chromedriver/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cairo, fontconfig, freetype, gdk_pixbuf, glib
+{ stdenv, fetchurl, cairo, fontconfig, freetype, gdk-pixbuf, glib
 , glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf
 , libXi, libXrender, libXext
 }:
@@ -21,7 +21,7 @@ let
   libs = stdenv.lib.makeLibraryPath [
     stdenv.cc.cc.lib
     cairo fontconfig freetype
-    gdk_pixbuf glib gtk2 gconf
+    gdk-pixbuf glib gtk2 gconf
     libX11 nspr nss pango libXrender
     gconf libXext libXi
   ];
diff --git a/pkgs/development/tools/thrust/default.nix b/pkgs/development/tools/thrust/default.nix
index 91a01edc23a..f07451ae840 100644
--- a/pkgs/development/tools/thrust/default.nix
+++ b/pkgs/development/tools/thrust/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, buildEnv, makeWrapper, glib, alsaLib , dbus, gtk2, atk
-, pango, freetype, fontconfig, gdk_pixbuf , cairo, cups, expat, nspr, gconf, nss
+, pango, freetype, fontconfig, gdk-pixbuf , cairo, cups, expat, nspr, gconf, nss
 , xorg, libcap, unzip
 }:
 
@@ -7,7 +7,7 @@ let
   thrustEnv = buildEnv {
     name = "env-thrust";
     paths = [
-      stdenv.cc.cc glib dbus gtk2 atk pango freetype fontconfig gdk_pixbuf
+      stdenv.cc.cc glib dbus gtk2 atk pango freetype fontconfig gdk-pixbuf
       cairo cups expat alsaLib nspr gconf nss xorg.libXrender xorg.libX11
       xorg.libXext xorg.libXdamage xorg.libXtst xorg.libXcomposite
       xorg.libXi xorg.libXfixes xorg.libXrandr xorg.libXcursor libcap
diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix
index 032865be7f5..54ace72c5fb 100644
--- a/pkgs/development/tools/unity3d/default.nix
+++ b/pkgs/development/tools/unity3d/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, makeWrapper, file, getopt
-, gtk2, gtk3, gdk_pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb
+, gtk2, gtk3, gdk-pixbuf, glib, libGL, libGLU, nss, nspr, udev, tbb
 , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango
 , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit
 , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi
@@ -9,12 +9,12 @@
 
 let
   libPath64 = lib.makeLibraryPath [
-    gcc.cc gtk2 gdk_pixbuf glib libGL libGLU nss nspr
+    gcc.cc gtk2 gdk-pixbuf glib libGL libGLU nss nspr
     alsaLib GConf cups libcap fontconfig freetype pango
     cairo dbus expat zlib libpng12 udev tbb
     libX11 libXcursor libXdamage libXfixes libXrender libXi
     libXcomposite libXext libXrandr libXtst libSM libICE libxcb
-    libpqxx gtk3 
+    libpqxx gtk3
   ];
   libPath32 = lib.makeLibraryPath [ gcc_32bit.cc ];
   binPath = lib.makeBinPath [ nodejs gnutar ];
@@ -82,7 +82,7 @@ in stdenv.mkDerivation rec {
     }
 
     upm_linux=$unitydir/Data/Resources/PackageManager/Server/UnityPackageManager
-    
+
 
     orig_size=$(stat --printf=%s $upm_linux)
 
@@ -102,7 +102,7 @@ in stdenv.mkDerivation rec {
     # ^-- grep points here
     #
     # var_* are as described above
-    # shift_by seems to be safe so long as all patchelf adjustments occur 
+    # shift_by seems to be safe so long as all patchelf adjustments occur
     # before any locations pointed to by hardcoded offsets
 
     var_skip=20
diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 264f77a7fd9..26cec8f3730 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -1,6 +1,6 @@
 { stdenv, makeWrapper, fetchurl, dpkg
 , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype
-, gdk_pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk
+, gdk-pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk
 , gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook
 , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext
 , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2
@@ -25,13 +25,13 @@ in stdenv.mkDerivation rec {
     sha256 = "0km7anw5xpcfr6j7pwqhv26pk7nxv1jywqlz0lpvgj6w85aafcm3";
   };
 
-  nativeBuildInputs = [ 
+  nativeBuildInputs = [
     autoPatchelfHook
     dpkg
     makeWrapper
     gobject-introspection wrapGAppsHook
   ];
-  
+
   buildInputs = [
     alsaLib
     at-spi2-atk
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
     expat
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gnome2.GConf
     gnome2.pango
diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix
index a09a84e4bf7..58b0f0e876f 100644
--- a/pkgs/development/web/postman/default.nix
+++ b/pkgs/development/web/postman/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
       pkgs.cups
       pkgs.dbus.daemon.lib
       pkgs.expat
-      pkgs.gdk_pixbuf
+      pkgs.gdk-pixbuf
       pkgs.glib
       pkgs.gtk2-x11
       pkgs.freetype
diff --git a/pkgs/games/arena/default.nix b/pkgs/games/arena/default.nix
index 460fc049c7b..a2a5f7b723a 100644
--- a/pkgs/games/arena/default.nix
+++ b/pkgs/games/arena/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk_pixbuf, libX11 }:
+{ stdenv, fetchurl, gtk2-x11, glib, pango, cairo, atk, gdk-pixbuf, libX11 }:
 
 # Arena is free software in the sense of "free beer" but not as in "free
 # speech". We can install it as we please, but we cannot re-distribute it in
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   };
 
   # stdenv.cc.cc.lib is in that list to pick up libstdc++.so. Is there a better way?
-  buildInputs = [gtk2-x11 glib pango cairo atk gdk_pixbuf libX11 stdenv.cc.cc.lib];
+  buildInputs = [gtk2-x11 glib pango cairo atk gdk-pixbuf libX11 stdenv.cc.cc.lib];
 
   unpackPhase = ''
     # This is is a tar bomb, i.e. it extract a dozen files and directories to
diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix
index 391ced36207..74e3b897a03 100644
--- a/pkgs/games/planetaryannihilation/default.nix
+++ b/pkgs/games/planetaryannihilation/default.nix
@@ -1,5 +1,5 @@
 { stdenv, config, fetchurl, patchelf, makeWrapper, gtk2, glib, udev, alsaLib, atk
-, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk_pixbuf, curl, systemd, xorg }:
+, nspr, fontconfig, cairo, pango, nss, freetype, gnome2, gdk-pixbuf, curl, systemd, xorg }:
 
 # TODO: use dynamic attributes once Nix 1.7 is out
 assert ((config.planetary_annihilation or null).url or null) != null;
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ patchelf makeWrapper ];
- 
+
   installPhase = ''
     mkdir -p $out/{bin,lib}
 
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA"
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk_pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
+    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib xorg.libXdamage xorg.libXfixes gtk2 glib stdenv.glibc.out "$out" xorg.libXext pango udev xorg.libX11 xorg.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome2.GConf gdk-pixbuf xorg.libXrender ]}:{stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64" "$out/host/CoherentUI_Host"
 
     wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib stdenv.glibc.out xorg.libX11 xorg.libXcursor gtk2 glib curl "$out" ]}:${stdenv.cc.cc.lib}/lib64:${stdenv.glibc.out}/lib64"
 
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 3cf2d896645..9e6bfc7bab8 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -90,7 +90,7 @@ in buildFHSUserEnv rec {
     gtk2
     bzip2
     zlib
-    gdk_pixbuf
+    gdk-pixbuf
 
     # Without these it silently fails
     xorg.libXinerama
diff --git a/pkgs/misc/emulators/cdemu/analyzer.nix b/pkgs/misc/emulators/cdemu/analyzer.nix
index a57fda56ddd..e52cf7efc6b 100644
--- a/pkgs/misc/emulators/cdemu/analyzer.nix
+++ b/pkgs/misc/emulators/cdemu/analyzer.nix
@@ -1,5 +1,5 @@
 { callPackage, makeWrapper, gobject-introspection, cmake
-, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk_pixbuf, librsvg, intltool, libmirage }:
+, python3Packages, gtk3, glib, libxml2, gnuplot, gnome3, gdk-pixbuf, librsvg, intltool, libmirage }:
 let pkg = import ./base.nix {
   version = "3.2.2";
   pkgName = "image-analyzer";
@@ -7,7 +7,7 @@ let pkg = import ./base.nix {
 };
 in callPackage pkg {
   buildInputs = [ glib gtk3 libxml2 gnuplot libmirage makeWrapper
-                  gnome3.adwaita-icon-theme gdk_pixbuf librsvg intltool
+                  gnome3.adwaita-icon-theme gdk-pixbuf librsvg intltool
                   python3Packages.python python3Packages.pygobject3 python3Packages.matplotlib ];
   drvParams = {
     nativeBuildInputs = [ gobject-introspection cmake ];
diff --git a/pkgs/misc/emulators/cdemu/gui.nix b/pkgs/misc/emulators/cdemu/gui.nix
index 331ad0ded24..e06853b8f73 100644
--- a/pkgs/misc/emulators/cdemu/gui.nix
+++ b/pkgs/misc/emulators/cdemu/gui.nix
@@ -1,5 +1,5 @@
 { callPackage, makeWrapper, gobject-introspection, cmake
-, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk_pixbuf, librsvg }:
+, python3Packages, gtk3, glib, libnotify, intltool, gnome3, gdk-pixbuf, librsvg }:
 let
   pkg = import ./base.nix {
     version = "3.2.1";
@@ -9,7 +9,7 @@ let
   inherit (python3Packages) python pygobject3;
 in callPackage pkg {
   buildInputs = [ python pygobject3 gtk3 glib libnotify intltool makeWrapper
-                  gnome3.adwaita-icon-theme gdk_pixbuf librsvg ];
+                  gnome3.adwaita-icon-theme gdk-pixbuf librsvg ];
   drvParams = {
     nativeBuildInputs = [ gobject-introspection cmake ];
     postFixup = ''
diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index 5fee8b4b83d..edf4fe017a2 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, alsaLib, curl, gdk_pixbuf, glib, gtk3, libGLU_combined,
+{ stdenv, fetchurl, alsaLib, curl, gdk-pixbuf, glib, gtk3, libGLU_combined,
   libX11, openssl, ncurses5, SDL, SDL_ttf, unzip, zlib, wrapGAppsHook }:
 
 with stdenv.lib;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsaLib
     curl
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gtk3
     libX11
diff --git a/pkgs/misc/emulators/kega-fusion/default.nix b/pkgs/misc/emulators/kega-fusion/default.nix
index 01785bd9a27..32d3013d842 100644
--- a/pkgs/misc/emulators/kega-fusion/default.nix
+++ b/pkgs/misc/emulators/kega-fusion/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk_pixbuf, pango, libXinerama, mpg123, runtimeShell }:
+{ stdenv, lib, writeText, fetchurl, upx, libGLU, glib, gtk2, alsaLib, libSM, libX11, gdk-pixbuf, pango, libXinerama, mpg123, runtimeShell }:
 
 let
-  libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk_pixbuf pango libXinerama ];
+  libPath = lib.makeLibraryPath [ stdenv.cc.cc libGLU glib gtk2 alsaLib libSM libX11 gdk-pixbuf pango libXinerama ];
 
 in stdenv.mkDerivation rec {
   name = "kega-fusion-${version}";
diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix
index 9eb353ede58..5bc7bcec9d4 100644
--- a/pkgs/misc/emulators/nestopia/default.nix
+++ b/pkgs/misc/emulators/nestopia/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, SDL2, alsaLib, gtk3
 , makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils
-, epoxy, gdk_pixbuf, gnome3, wrapGAppsHook
+, epoxy, gdk-pixbuf, gnome3, wrapGAppsHook
 }:
 
 stdenv.mkDerivation rec {
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     alsaLib
     epoxy
     gtk3
-    gdk_pixbuf
+    gdk-pixbuf
     libGLU_combined
     libarchive
     libao
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix
index 4fef8d08043..7ca9843e2e3 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/misc/solfege/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, pythonPackages, gettext, texinfo
-, ghostscript, librsvg, gdk_pixbuf, txt2man, timidity, mpg123
+, ghostscript, librsvg, gdk-pixbuf, txt2man, timidity, mpg123
 , alsaUtils, vorbis-tools, csound, lilypond
 , makeWrapper
 }:
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ python pygtk gettext texinfo
-    ghostscript librsvg gdk_pixbuf txt2man makeWrapper
+    ghostscript librsvg gdk-pixbuf txt2man makeWrapper
   ];
 
   preBuild = ''
diff --git a/pkgs/misc/themes/adapta/default.nix b/pkgs/misc/themes/adapta/default.nix
index cb281e68dfd..6d2a16cbfd2 100644
--- a/pkgs/misc/themes/adapta/default.nix
+++ b/pkgs/misc/themes/adapta/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk_pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, parallel, sassc, inkscape, libxml2, glib, gdk-pixbuf, librsvg, gtk-engine-murrine, gnome3 }:
 
 stdenv.mkDerivation rec {
   name = "adapta-gtk-theme-${version}";
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gdk_pixbuf
+    gdk-pixbuf
     librsvg
   ];
 
diff --git a/pkgs/misc/themes/equilux-theme/default.nix b/pkgs/misc/themes/equilux-theme/default.nix
index 66e88630342..bc4b57e8b58 100644
--- a/pkgs/misc/themes/equilux-theme/default.nix
+++ b/pkgs/misc/themes/equilux-theme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk_pixbuf, librsvg, bc }:
+{ stdenv, fetchFromGitHub, gnome3, glib, libxml2, gtk-engine-murrine, gdk-pixbuf, librsvg, bc }:
 
 stdenv.mkDerivation rec {
   name = "equilux-theme-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ glib libxml2 bc ];
 
-  buildInputs = [ gnome3.gnome-themes-extra gdk_pixbuf librsvg ];
+  buildInputs = [ gnome3.gnome-themes-extra gdk-pixbuf librsvg ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/misc/themes/numix-solarized/default.nix b/pkgs/misc/themes/numix-solarized/default.nix
index 3c81e4308ca..97a018f929e 100644
--- a/pkgs/misc/themes/numix-solarized/default.nix
+++ b/pkgs/misc/themes/numix-solarized/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, python3, sass, glib, gdk_pixbuf, libxml2,
+{ stdenv, fetchFromGitHub, python3, sass, glib, gdk-pixbuf, libxml2,
   inkscape, optipng, gtk-engine-murrine
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "0l4xvsiyg15kp6xwpvm3jckxyhr1lxd678lkhrcyf40n7rd4xinl";
   };
 
-  nativeBuildInputs = [ python3 sass glib gdk_pixbuf libxml2 inkscape optipng ];
+  nativeBuildInputs = [ python3 sass glib gdk-pixbuf libxml2 inkscape optipng ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/misc/themes/numix/default.nix b/pkgs/misc/themes/numix/default.nix
index 4fb41248109..eb4b8c76301 100644
--- a/pkgs/misc/themes/numix/default.nix
+++ b/pkgs/misc/themes/numix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk_pixbuf
+{ stdenv, fetchFromGitHub, sass, glib, libxml2, gdk-pixbuf
 , gtk-engine-murrine
 }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "12mw0kr0kkvg395qlbsvkvaqccr90cmxw5rrsl236zh43kj8grb7";
   };
 
-  nativeBuildInputs = [ sass glib libxml2 gdk_pixbuf ];
+  nativeBuildInputs = [ sass glib libxml2 gdk-pixbuf ];
 
   propagatedUserEnvPkgs = [ gtk-engine-murrine ];
 
diff --git a/pkgs/os-specific/linux/usermount/default.nix b/pkgs/os-specific/linux/usermount/default.nix
index 94e5d998cd0..5cb49485c5b 100644
--- a/pkgs/os-specific/linux/usermount/default.nix
+++ b/pkgs/os-specific/linux/usermount/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk_pixbuf }:
+{ stdenv, fetchgit, pkgconfig, dbus, libnotify, udisks2, gdk-pixbuf }:
 
 stdenv.mkDerivation {
   name = "usermount-0.1";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ dbus libnotify udisks2 gdk_pixbuf ];
+  buildInputs = [ dbus libnotify udisks2 gdk-pixbuf ];
 
   NIX_CFLAGS_COMPILE = [ "-DENABLE_NOTIFICATIONS" ];
 
diff --git a/pkgs/tools/X11/caffeine-ng/default.nix b/pkgs/tools/X11/caffeine-ng/default.nix
index aff7b8adfc2..57f32ed8225 100644
--- a/pkgs/tools/X11/caffeine-ng/default.nix
+++ b/pkgs/tools/X11/caffeine-ng/default.nix
@@ -1,4 +1,4 @@
-{ gdk_pixbuf, glib, gobject-introspection, gtk3, lib, libnotify,
+{ gdk-pixbuf, glib, gobject-introspection, gtk3, lib, libnotify,
   pythonPackages, wrapGAppsHook
 }:
 
@@ -12,7 +12,7 @@ pythonPackages.buildPythonApplication rec {
   };
 
   nativeBuildInputs = [ wrapGAppsHook glib ];
-  buildInputs = [ gdk_pixbuf gobject-introspection libnotify gtk3 ];
+  buildInputs = [ gdk-pixbuf gobject-introspection libnotify gtk3 ];
   pythonPath = with pythonPackages; [
     dbus-python docopt ewmh pygobject3 pyxdg
     setproctitle setuptools setuptools_scm wheel
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index efafbb3692e..863c02fb23d 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, callPackage, substituteAll, python3, pkgconfig
-, xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk
+, xorg, gtk3, glib, pango, cairo, gdk-pixbuf, atk
 , wrapGAppsHook, xorgserver, getopt, xauth, utillinux, which
 , ffmpeg_4, x264, libvpx, libwebp, x265
 , libfakeXinerama
@@ -40,7 +40,7 @@ in buildPythonApplication rec {
     ] ++ [
     cython
 
-    pango cairo gdk_pixbuf atk.out gtk3 glib
+    pango cairo gdk-pixbuf atk.out gtk3 glib
 
     ffmpeg_4 libvpx x264 libwebp x265
 
diff --git a/pkgs/tools/audio/gvolicon/default.nix b/pkgs/tools/audio/gvolicon/default.nix
index 4a0c244f07f..c66c6bc1f7e 100644
--- a/pkgs/tools/audio/gvolicon/default.nix
+++ b/pkgs/tools/audio/gvolicon/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook }:
+{ stdenv, makeWrapper, alsaLib, pkgconfig, fetchgit, gtk3, gnome3, gdk-pixbuf, librsvg, wrapGAppsHook }:
 
 stdenv.mkDerivation {
   name = "gvolicon-2014-04-28";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
-    makeWrapper alsaLib gtk3 gdk_pixbuf gnome3.adwaita-icon-theme
+    makeWrapper alsaLib gtk3 gdk-pixbuf gnome3.adwaita-icon-theme
     librsvg wrapGAppsHook
   ];
 
diff --git a/pkgs/tools/graphics/blur-effect/default.nix b/pkgs/tools/graphics/blur-effect/default.nix
index 5bb20998439..49900401319 100644
--- a/pkgs/tools/graphics/blur-effect/default.nix
+++ b/pkgs/tools/graphics/blur-effect/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, cmake, gdk_pixbuf, libGL, mesa }:
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, gdk-pixbuf, libGL, mesa }:
 
 stdenv.mkDerivation rec {
   pname = "blur-effect";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    gdk_pixbuf
+    gdk-pixbuf
     libGL
     mesa
   ];
diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index d2090d77676..07fa8d2beb5 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -1,5 +1,5 @@
 { stdenv, substituteAll, fetchurl, fetchFromGitHub, autoreconfHook, gettext, makeWrapper, pkgconfig
-, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk_pixbuf, gobject-introspection, gtk2
+, vala, wrapGAppsHook, dbus, dconf ? null, glib, gdk-pixbuf, gobject-introspection, gtk2
 , gtk3, gtk-doc, isocodes, python3, json-glib, libnotify ? null, enablePython2Library ? false
 , enableUI ? true, withWayland ? false, libxkbcommon ? null, wayland ? null
 , buildPackages, runtimeShell }:
@@ -134,7 +134,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     dbus
     dconf
-    gdk_pixbuf
+    gdk-pixbuf
     gobject-introspection
     python3.pkgs.pygobject3 # for pygobject overrides
     gtk2
diff --git a/pkgs/tools/misc/birdfont/default.nix b/pkgs/tools/misc/birdfont/default.nix
index 2de6715db8f..56e7650673e 100644
--- a/pkgs/tools/misc/birdfont/default.nix
+++ b/pkgs/tools/misc/birdfont/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, python3, xmlbird,
-cairo, gdk_pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala,
+cairo, gdk-pixbuf, libgee, glib, gtk3, webkitgtk, libnotify, sqlite, vala,
 gobject-introspection, gsettings-desktop-schemas, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ python3 pkgconfig vala gobject-introspection wrapGAppsHook ];
-  buildInputs = [ xmlbird libgee cairo gdk_pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ];
+  buildInputs = [ xmlbird libgee cairo gdk-pixbuf glib gtk3 webkitgtk libnotify sqlite gsettings-desktop-schemas ];
 
   postPatch = "patchShebangs .";
 
diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index dcbee0e343e..794c06b8044 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper
 , dpkg, patchelf
-, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
+, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd
 , libXdamage, expat }:
 
 let
   inherit (stdenv) lib;
   LD_LIBRARY_PATH = lib.makeLibraryPath
-    [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ];
+    [ glib gtk2 gdk-pixbuf alsaLib nss nspr GConf cups libgcrypt dbus libXdamage expat ];
 in
 stdenv.mkDerivation rec {
   version = "2.8.1";
diff --git a/pkgs/tools/misc/sweep-visualizer/default.nix b/pkgs/tools/misc/sweep-visualizer/default.nix
index cbf849494b7..fd0a766f54e 100644
--- a/pkgs/tools/misc/sweep-visualizer/default.nix
+++ b/pkgs/tools/misc/sweep-visualizer/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, makeWrapper, fetchurl,
-  alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib,
+  alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib,
   gnome2, gtk2-x11, nspr, nss,
   libX11, libxcb, libXcomposite, libXcursor, libXdamage, libXext, libXfixes,
   libXi, libXrandr, libXrender, libXScrnSaver, libXtst,
@@ -13,7 +13,7 @@
       url = "https://s3.amazonaws.com/scanse/Visualizer/v${version}/sweepvisualizer_${version}_amd64.deb";
       sha256 = "1k6rdjw2340qrzafv6hjxvbvyh3s1wad6d3629nchdcrpyx9xy1c";
     };
-    
+
     nativeBuildInputs = [ makeWrapper ];
 
     sourceRoot = ".";
@@ -32,8 +32,8 @@
 
     preFixup = let
       libPath = lib.makeLibraryPath [
-        alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype 
-        gdk_pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib
+        alsaLib atk cairo cups.lib dbus.lib expat fontconfig.lib freetype
+        gdk-pixbuf glib gnome2.GConf gnome2.pango gtk2-x11 nspr nss stdenv.cc.cc.lib
         libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes
         libXi libXrandr libXrender libXScrnSaver libXtst
       ];
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 02583343117..6750bbe8ae6 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto, wrapGAppsHook
 , docbook_xml_dtd_412, docbook_xsl
-, libxml2, desktop-file-utils, libusb1, cups, gdk_pixbuf, pango, atk, libnotify
+, libxml2, desktop-file-utils, libusb1, cups, gdk-pixbuf, pango, atk, libnotify
 , gobject-introspection, libsecret
 , cups-filters
 , pythonPackages
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     glib udev libusb1 cups
     pythonPackages.python
-    libnotify gobject-introspection gdk_pixbuf pango atk
+    libnotify gobject-introspection gdk-pixbuf pango atk
     libsecret
   ];
 
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index bf0a43ce515..fd932617c93 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchFromGitHub, libpcap, libjpeg , libungif, libpng
-, giflib, glib, gtk2, cairo, pango, gdk_pixbuf, atk
+, giflib, glib, gtk2, cairo, pango, gdk-pixbuf, atk
 , pkgconfig, autoreconfHook }:
 
 with lib;
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [
     libpcap libjpeg libungif libpng giflib
-    glib gtk2 glib cairo pango gdk_pixbuf atk autoreconfHook
+    glib gtk2 glib cairo pango gdk-pixbuf atk autoreconfHook
   ];
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix
index 8d0c7876431..6f79be83be5 100644
--- a/pkgs/tools/security/encryptr/default.nix
+++ b/pkgs/tools/security/encryptr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype
 , pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes
 , libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr
-, expat, libcap, systemd , dbus, gtk2 , gdk_pixbuf, libnotify
+, expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify
 }:
 
 let
@@ -27,7 +27,7 @@ in stdenv.mkDerivation rec {
   rpath = stdenv.lib.makeLibraryPath [
     glib nss nspr gconf fontconfig freetype pango cairo libX11 libXi
     libXcursor libXext libXfixes libXrender libXcomposite alsaLib
-    libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk_pixbuf
+    libXdamage libXtst libXrandr expat libcap dbus gtk2 gdk-pixbuf
     libnotify stdenv.cc.cc
   ];
 
diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix
index f84f0039347..afe2d457a7f 100644
--- a/pkgs/tools/security/keybase/gui.nix
+++ b/pkgs/tools/security/keybase/gui.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, alsaLib, atk, cairo, cups, udev
-, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, gtk3
+, dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3
 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook
 , runtimeShell, gsettings-desktop-schemas }:
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     expat
     fontconfig
     freetype
-    gdk_pixbuf
+    gdk-pixbuf
     glib
     gsettings-desktop-schemas
     gtk3
diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 3fdc8780888..d71fa0c4e58 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -13,7 +13,7 @@
 , libmemcached, cyrus_sasl
 , libmicrohttpd
 , libmodbus
-, libnotify, gdk_pixbuf
+, libnotify, gdk-pixbuf
 , liboping
 , libpcap
 , libsigrok
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
   buildInputs = [
     curl libdbi libgcrypt libmemcached
-    cyrus_sasl libnotify gdk_pixbuf liboping libpcap libvirt
+    cyrus_sasl libnotify gdk-pixbuf liboping libpcap libvirt
     libxml2 postgresql protobufc rrdtool
     varnish yajl jdk libtool python hiredis libmicrohttpd
     riemann_c_client mosquitto rdkafka mongoc
diff --git a/pkgs/tools/system/ddrescueview/default.nix b/pkgs/tools/system/ddrescueview/default.nix
index 517cefb6a2b..466232e2bf7 100644
--- a/pkgs/tools/system/ddrescueview/default.nix
+++ b/pkgs/tools/system/ddrescueview/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk_pixbuf, glib, gtk2, libX11, pango }:
+{ stdenv, lib, fetchurl, fpc, lazarus, atk, cairo, gdk-pixbuf, glib, gtk2, libX11, pango }:
 
 stdenv.mkDerivation rec {
   name = "ddrescueview-0.4alpha3";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ fpc lazarus ];
 
-  buildInputs = [ atk cairo gdk_pixbuf glib gtk2 libX11 pango ];
+  buildInputs = [ atk cairo gdk-pixbuf glib gtk2 libX11 pango ];
 
   sourceRoot = "source";
 
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fd873605056..44a27fa6c17 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -107,6 +107,7 @@ mapAliases ({
   fuseki = apache-jena-fuseki; # added 2018-04-25
   gccApple = throw "gccApple is no longer supported"; # added 2018-04-25
   gdb-multitarget = gdb; # added 2017-11-13
+  gdk_pixbuf = gdk-pixbuf; # added 2019-05-22
   gettextWithExpat = gettext; # 2016-02-19
   git-hub = gitAndTools.git-hub; # added 2016-04-29
   glib_networking = glib-networking; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7a160d14e8..2de4367a9e7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10883,7 +10883,7 @@ in
 
   gdata-sharp = callPackage ../development/libraries/gdata-sharp { };
 
-  gdk_pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
+  gdk-pixbuf = callPackage ../development/libraries/gdk-pixbuf { };
 
   gnome-sharp = callPackage ../development/libraries/gnome-sharp { mono = mono4; };
 

From 07bbae0bb721d84d8ffca4fef57e090130fe7c36 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Mon, 1 Jul 2019 17:52:08 -0400
Subject: [PATCH 41/53] way-cooler: regenerate crates-io.nix

---
 .../window-managers/way-cooler/crates-io.nix  | 784 ++++++++++--------
 1 file changed, 436 insertions(+), 348 deletions(-)

diff --git a/pkgs/applications/window-managers/way-cooler/crates-io.nix b/pkgs/applications/window-managers/way-cooler/crates-io.nix
index 29e25640191..955dfe9b44a 100644
--- a/pkgs/applications/window-managers/way-cooler/crates-io.nix
+++ b/pkgs/applications/window-managers/way-cooler/crates-io.nix
@@ -10,6 +10,7 @@ rec {
   crates.aho_corasick."0.5.3" = deps: { features?(features_.aho_corasick."0.5.3" deps {}) }: buildRustCrate {
     crateName = "aho-corasick";
     version = "0.5.3";
+    description = "Fast multiple substring searching with finite state machines.";
     authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
     sha256 = "1igab46mvgknga3sxkqc917yfff0wsjxjzabdigmh240p5qxqlnn";
     libName = "aho_corasick";
@@ -33,6 +34,7 @@ rec {
   crates.bitflags."0.4.0" = deps: { features?(features_.bitflags."0.4.0" deps {}) }: buildRustCrate {
     crateName = "bitflags";
     version = "0.4.0";
+    description = "A macro to generate structures which behave like bitflags.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "0an03kibhfcc0mcxf6a0mvbab0s7cggnvflw8jn0b15i351h828c";
     features = mkFeatures (features."bitflags"."0.4.0" or {});
@@ -48,6 +50,7 @@ rec {
   crates.bitflags."0.6.0" = deps: { features?(features_.bitflags."0.6.0" deps {}) }: buildRustCrate {
     crateName = "bitflags";
     version = "0.6.0";
+    description = "A macro to generate structures which behave like bitflags.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1znq4b770mdp3kdj9yz199ylc2pmf8l5j2f281jjrcfhg1mm22h6";
   };
@@ -62,6 +65,7 @@ rec {
   crates.bitflags."0.7.0" = deps: { features?(features_.bitflags."0.7.0" deps {}) }: buildRustCrate {
     crateName = "bitflags";
     version = "0.7.0";
+    description = "A macro to generate structures which behave like bitflags.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1hr72xg5slm0z4pxs2hiy4wcyx3jva70h58b7mid8l0a4c8f7gn5";
   };
@@ -76,17 +80,18 @@ rec {
   crates.bitflags."0.9.1" = deps: { features?(features_.bitflags."0.9.1" deps {}) }: buildRustCrate {
     crateName = "bitflags";
     version = "0.9.1";
+    description = "A macro to generate structures which behave like bitflags.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "18h073l5jd88rx4qdr95fjddr9rk79pb1aqnshzdnw16cfmb9rws";
     features = mkFeatures (features."bitflags"."0.9.1" or {});
   };
   features_.bitflags."0.9.1" = deps: f: updateFeatures f (rec {
     bitflags = fold recursiveUpdate {} [
-      { "0.9.1".default = (f.bitflags."0.9.1".default or true); }
-      { "0.9.1".example_generated =
-        (f.bitflags."0.9.1".example_generated or false) ||
+      { "0.9.1"."example_generated" =
+        (f.bitflags."0.9.1"."example_generated" or false) ||
         (f.bitflags."0.9.1".default or false) ||
         (bitflags."0.9.1"."default" or false); }
+      { "0.9.1".default = (f.bitflags."0.9.1".default or true); }
     ];
   }) [];
 
@@ -97,6 +102,7 @@ rec {
   crates.bitflags."1.0.4" = deps: { features?(features_.bitflags."1.0.4" deps {}) }: buildRustCrate {
     crateName = "bitflags";
     version = "1.0.4";
+    description = "A macro to generate structures which behave like bitflags.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1g1wmz2001qmfrd37dnd5qiss5njrw26aywmg6yhkmkbyrhjxb08";
     features = mkFeatures (features."bitflags"."1.0.4" or {});
@@ -112,6 +118,7 @@ rec {
   crates.c_vec."1.2.1" = deps: { features?(features_.c_vec."1.2.1" deps {}) }: buildRustCrate {
     crateName = "c_vec";
     version = "1.2.1";
+    description = "Structures to wrap C arrays";
     authors = [ "Guillaume Gomez <guillaume1.gomez@gmail.com>" ];
     sha256 = "15gm72wx9kd0n51454i58rmpkmig8swghrj2440frxxi9kqg97xd";
   };
@@ -126,6 +133,7 @@ rec {
   crates.cairo_rs."0.2.0" = deps: { features?(features_.cairo_rs."0.2.0" deps {}) }: buildRustCrate {
     crateName = "cairo-rs";
     version = "0.2.0";
+    description = "Rust bindings for the Cairo library";
     authors = [ "The Gtk-rs Project Developers" ];
     sha256 = "0bcbhbyips15b7la4r43p4x57jv1w2ll8iwg9lxwvzz5k6c7iwvd";
     libName = "cairo";
@@ -148,25 +156,25 @@ rec {
   features_.cairo_rs."0.2.0" = deps: f: updateFeatures f (rec {
     c_vec."${deps.cairo_rs."0.2.0".c_vec}".default = true;
     cairo_rs = fold recursiveUpdate {} [
-      { "0.2.0".default = (f.cairo_rs."0.2.0".default or true); }
-      { "0.2.0".glib =
-        (f.cairo_rs."0.2.0".glib or false) ||
+      { "0.2.0"."glib" =
+        (f.cairo_rs."0.2.0"."glib" or false) ||
         (f.cairo_rs."0.2.0".use_glib or false) ||
         (cairo_rs."0.2.0"."use_glib" or false); }
-      { "0.2.0".glib-sys =
-        (f.cairo_rs."0.2.0".glib-sys or false) ||
+      { "0.2.0"."glib-sys" =
+        (f.cairo_rs."0.2.0"."glib-sys" or false) ||
         (f.cairo_rs."0.2.0".use_glib or false) ||
         (cairo_rs."0.2.0"."use_glib" or false); }
-      { "0.2.0".gtk-rs-lgpl-docs =
-        (f.cairo_rs."0.2.0".gtk-rs-lgpl-docs or false) ||
+      { "0.2.0"."gtk-rs-lgpl-docs" =
+        (f.cairo_rs."0.2.0"."gtk-rs-lgpl-docs" or false) ||
         (f.cairo_rs."0.2.0".embed-lgpl-docs or false) ||
         (cairo_rs."0.2.0"."embed-lgpl-docs" or false) ||
         (f.cairo_rs."0.2.0".purge-lgpl-docs or false) ||
         (cairo_rs."0.2.0"."purge-lgpl-docs" or false); }
-      { "0.2.0".use_glib =
-        (f.cairo_rs."0.2.0".use_glib or false) ||
+      { "0.2.0"."use_glib" =
+        (f.cairo_rs."0.2.0"."use_glib" or false) ||
         (f.cairo_rs."0.2.0".default or false) ||
         (cairo_rs."0.2.0"."default" or false); }
+      { "0.2.0".default = (f.cairo_rs."0.2.0".default or true); }
     ];
     cairo_sys_rs = fold recursiveUpdate {} [
       { "${deps.cairo_rs."0.2.0".cairo_sys_rs}"."png" =
@@ -203,6 +211,7 @@ rec {
   crates.cairo_sys_rs."0.4.0" = deps: { features?(features_.cairo_sys_rs."0.4.0" deps {}) }: buildRustCrate {
     crateName = "cairo-sys-rs";
     version = "0.4.0";
+    description = "FFI bindings to libcairo";
     authors = [ "The Gtk-rs Project Developers" ];
     sha256 = "062nxihlydci65pyy2ldn7djkc9sm7a5xvkl8pxrsxfxvfapm5br";
     libName = "cairo_sys";
@@ -221,15 +230,15 @@ rec {
   };
   features_.cairo_sys_rs."0.4.0" = deps: f: updateFeatures f (rec {
     cairo_sys_rs = fold recursiveUpdate {} [
-      { "0.4.0".default = (f.cairo_sys_rs."0.4.0".default or true); }
-      { "0.4.0".v1_12 =
-        (f.cairo_sys_rs."0.4.0".v1_12 or false) ||
+      { "0.4.0"."v1_12" =
+        (f.cairo_sys_rs."0.4.0"."v1_12" or false) ||
         (f.cairo_sys_rs."0.4.0".v1_14 or false) ||
         (cairo_sys_rs."0.4.0"."v1_14" or false); }
-      { "0.4.0".x11 =
-        (f.cairo_sys_rs."0.4.0".x11 or false) ||
+      { "0.4.0"."x11" =
+        (f.cairo_sys_rs."0.4.0"."x11" or false) ||
         (f.cairo_sys_rs."0.4.0".xlib or false) ||
         (cairo_sys_rs."0.4.0"."xlib" or false); }
+      { "0.4.0".default = (f.cairo_sys_rs."0.4.0".default or true); }
     ];
     libc."${deps.cairo_sys_rs."0.4.0".libc}".default = true;
     pkg_config."${deps.cairo_sys_rs."0.4.0".pkg_config}".default = true;
@@ -247,6 +256,7 @@ rec {
   crates.cc."1.0.25" = deps: { features?(features_.cc."1.0.25" deps {}) }: buildRustCrate {
     crateName = "cc";
     version = "1.0.25";
+    description = "A build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n";
     authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
     sha256 = "0pd8fhjlpr5qan984frkf1c8nxrqp6827wmmfzhm2840229z2hq0";
     dependencies = mapFeatures features ([
@@ -255,11 +265,11 @@ rec {
   };
   features_.cc."1.0.25" = deps: f: updateFeatures f (rec {
     cc = fold recursiveUpdate {} [
-      { "1.0.25".default = (f.cc."1.0.25".default or true); }
-      { "1.0.25".rayon =
-        (f.cc."1.0.25".rayon or false) ||
+      { "1.0.25"."rayon" =
+        (f.cc."1.0.25"."rayon" or false) ||
         (f.cc."1.0.25".parallel or false) ||
         (cc."1.0.25"."parallel" or false); }
+      { "1.0.25".default = (f.cc."1.0.25".default or true); }
     ];
   }) [];
 
@@ -270,6 +280,7 @@ rec {
   crates.cfg_if."0.1.6" = deps: { features?(features_.cfg_if."0.1.6" deps {}) }: buildRustCrate {
     crateName = "cfg-if";
     version = "0.1.6";
+    description = "A macro to ergonomically define an item depending on a large number of #[cfg]\nparameters. Structured like an if-else chain, the first matching branch is the\nitem that gets emitted.\n";
     authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
     sha256 = "11qrix06wagkplyk908i3423ps9m9np6c4vbcq81s9fyl244xv3n";
   };
@@ -284,6 +295,7 @@ rec {
   crates.cloudabi."0.0.3" = deps: { features?(features_.cloudabi."0.0.3" deps {}) }: buildRustCrate {
     crateName = "cloudabi";
     version = "0.0.3";
+    description = "Low level interface to CloudABI. Contains all syscalls and related types.";
     authors = [ "Nuxi (https://nuxi.nl/) and contributors" ];
     sha256 = "1z9lby5sr6vslfd14d6igk03s7awf91mxpsfmsp3prxbxlk0x7h5";
     libPath = "cloudabi.rs";
@@ -295,8 +307,8 @@ rec {
   features_.cloudabi."0.0.3" = deps: f: updateFeatures f (rec {
     bitflags."${deps.cloudabi."0.0.3".bitflags}".default = true;
     cloudabi = fold recursiveUpdate {} [
-      { "0.0.3".bitflags =
-        (f.cloudabi."0.0.3".bitflags or false) ||
+      { "0.0.3"."bitflags" =
+        (f.cloudabi."0.0.3"."bitflags" or false) ||
         (f.cloudabi."0.0.3".default or false) ||
         (cloudabi."0.0.3"."default" or false); }
       { "0.0.3".default = (f.cloudabi."0.0.3".default or true); }
@@ -312,6 +324,7 @@ rec {
   crates.dbus."0.4.1" = deps: { features?(features_.dbus."0.4.1" deps {}) }: buildRustCrate {
     crateName = "dbus";
     version = "0.4.1";
+    description = "Bindings to D-Bus, which is a bus commonly used on Linux for inter-process communication.";
     authors = [ "David Henningsson <diwic@ubuntu.com>" ];
     sha256 = "0qw32qj2rys318h780klxlznkwg93dfimbn8mc34m4940l8v00g9";
     build = "build.rs";
@@ -339,6 +352,7 @@ rec {
   crates.dbus_macros."0.0.6" = deps: { features?(features_.dbus_macros."0.0.6" deps {}) }: buildRustCrate {
     crateName = "dbus-macros";
     version = "0.0.6";
+    description = "Convenient macros to use the dbus crate";
     authors = [ "Antoni Boucher <bouanto@zoho.com>" ];
     sha256 = "1nymk2hzzgyafyr5nfa4r4frx4hml3wlwgzfr9b69vmcvn3d2jyd";
     dependencies = mapFeatures features ([
@@ -359,6 +373,7 @@ rec {
   crates.dlib."0.3.1" = deps: { features?(features_.dlib."0.3.1" deps {}) }: buildRustCrate {
     crateName = "dlib";
     version = "0.3.1";
+    description = "Helper macros for handling manually loading optionnal system libraries.";
     authors = [ "Victor Berger <victor.berger@m4x.org>" ];
     sha256 = "11mhh6g9vszp2ay3r46x4capnnmvvhx5hcp74bapxjhiixqjfvkr";
     dependencies = mapFeatures features ([
@@ -380,6 +395,7 @@ rec {
   crates.dlib."0.4.1" = deps: { features?(features_.dlib."0.4.1" deps {}) }: buildRustCrate {
     crateName = "dlib";
     version = "0.4.1";
+    description = "Helper macros for handling manually loading optional system libraries.";
     authors = [ "Victor Berger <victor.berger@m4x.org>" ];
     sha256 = "0h5xm6lanbl6v9y16g592bia33g7xb0n0fg98pvz6nsvg0layxlk";
     dependencies = mapFeatures features ([
@@ -401,6 +417,7 @@ rec {
   crates.dtoa."0.4.3" = deps: { features?(features_.dtoa."0.4.3" deps {}) }: buildRustCrate {
     crateName = "dtoa";
     version = "0.4.3";
+    description = "Fast functions for printing floating-point primitives to an io::Write";
     authors = [ "David Tolnay <dtolnay@gmail.com>" ];
     sha256 = "1xysdxdm24sk5ysim7lps4r2qaxfnj0sbakhmps4d42yssx30cw8";
   };
@@ -415,6 +432,7 @@ rec {
   crates.dummy_rustwlc."0.7.1" = deps: { features?(features_.dummy_rustwlc."0.7.1" deps {}) }: buildRustCrate {
     crateName = "dummy-rustwlc";
     version = "0.7.1";
+    description = "A dummy version of the functions defined in rust-wlc, to be used in testing and for travis builds";
     authors = [ "Snirk Immington <snirk.immington@gmail.com>" "Preston Carpenter <APragmaticPlace@gmail.com>" ];
     sha256 = "13priwnxpjvmym6yh9v9x1230ca04cba7bzbnn21pbvqngis1y88";
     dependencies = mapFeatures features ([
@@ -445,6 +463,7 @@ rec {
   crates.env_logger."0.3.5" = deps: { features?(features_.env_logger."0.3.5" deps {}) }: buildRustCrate {
     crateName = "env_logger";
     version = "0.3.5";
+    description = "An logging implementation for `log` which is configured via an environment\nvariable.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1mvxiaaqsyjliv1mm1qaagjqiccw11mdyi3n9h9rf8y6wj15zycw";
     dependencies = mapFeatures features ([
@@ -455,11 +474,11 @@ rec {
   };
   features_.env_logger."0.3.5" = deps: f: updateFeatures f (rec {
     env_logger = fold recursiveUpdate {} [
-      { "0.3.5".default = (f.env_logger."0.3.5".default or true); }
-      { "0.3.5".regex =
-        (f.env_logger."0.3.5".regex or false) ||
+      { "0.3.5"."regex" =
+        (f.env_logger."0.3.5"."regex" or false) ||
         (f.env_logger."0.3.5".default or false) ||
         (env_logger."0.3.5"."default" or false); }
+      { "0.3.5".default = (f.env_logger."0.3.5".default or true); }
     ];
     log."${deps.env_logger."0.3.5".log}".default = true;
     regex."${deps.env_logger."0.3.5".regex}".default = true;
@@ -475,6 +494,7 @@ rec {
   crates.fixedbitset."0.1.9" = deps: { features?(features_.fixedbitset."0.1.9" deps {}) }: buildRustCrate {
     crateName = "fixedbitset";
     version = "0.1.9";
+    description = "FixedBitSet is a simple bitset collection";
     authors = [ "bluss" ];
     sha256 = "1bkb5aq7h9p4rzlgxagnda1f0dd11q0qz41bmdy11z18q1p8igy1";
   };
@@ -489,6 +509,7 @@ rec {
   crates.fuchsia_zircon."0.3.3" = deps: { features?(features_.fuchsia_zircon."0.3.3" deps {}) }: buildRustCrate {
     crateName = "fuchsia-zircon";
     version = "0.3.3";
+    description = "Rust bindings for the Zircon kernel";
     authors = [ "Raph Levien <raph@google.com>" ];
     sha256 = "0jrf4shb1699r4la8z358vri8318w4mdi6qzfqy30p2ymjlca4gk";
     dependencies = mapFeatures features ([
@@ -512,6 +533,7 @@ rec {
   crates.fuchsia_zircon_sys."0.3.3" = deps: { features?(features_.fuchsia_zircon_sys."0.3.3" deps {}) }: buildRustCrate {
     crateName = "fuchsia-zircon-sys";
     version = "0.3.3";
+    description = "Low-level Rust bindings for the Zircon kernel";
     authors = [ "Raph Levien <raph@google.com>" ];
     sha256 = "08jp1zxrm9jbrr6l26bjal4dbm8bxfy57ickdgibsqxr1n9j3hf5";
   };
@@ -526,6 +548,7 @@ rec {
   crates.gcc."0.3.55" = deps: { features?(features_.gcc."0.3.55" deps {}) }: buildRustCrate {
     crateName = "gcc";
     version = "0.3.55";
+    description = "**Deprecated** crate, renamed to `cc`\n\nA build-time dependency for Cargo build scripts to assist in invoking the native\nC compiler to compile native C code into a static archive to be linked into Rust\ncode.\n";
     authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
     sha256 = "18qxv3hjdhp7pfcvbm2hvyicpgmk7xw8aii1l7fla8cxxbcrg2nz";
     dependencies = mapFeatures features ([
@@ -534,11 +557,11 @@ rec {
   };
   features_.gcc."0.3.55" = deps: f: updateFeatures f (rec {
     gcc = fold recursiveUpdate {} [
-      { "0.3.55".default = (f.gcc."0.3.55".default or true); }
-      { "0.3.55".rayon =
-        (f.gcc."0.3.55".rayon or false) ||
+      { "0.3.55"."rayon" =
+        (f.gcc."0.3.55"."rayon" or false) ||
         (f.gcc."0.3.55".parallel or false) ||
         (gcc."0.3.55"."parallel" or false); }
+      { "0.3.55".default = (f.gcc."0.3.55".default or true); }
     ];
   }) [];
 
@@ -546,76 +569,77 @@ rec {
 # end
 # gdk-pixbuf-0.2.0
 
-  crates.gdk-pixbuf."0.2.0" = deps: { features?(features_.gdk-pixbuf."0.2.0" deps {}) }: buildRustCrate {
+  crates.gdk_pixbuf."0.2.0" = deps: { features?(features_.gdk_pixbuf."0.2.0" deps {}) }: buildRustCrate {
     crateName = "gdk-pixbuf";
     version = "0.2.0";
+    description = "Rust bindings for the GdkPixbuf library";
     authors = [ "The Gtk-rs Project Developers" ];
     sha256 = "082z1s30haa59ax35wsv06mj8z8bhhq0fac36g01qa77kpiphj5y";
-    libName = "gdk-pixbuf";
+    libName = "gdk_pixbuf";
     build = "build.rs";
     dependencies = mapFeatures features ([
-      (crates."gdk_pixbuf_sys"."${deps."gdk-pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps)
-      (crates."glib"."${deps."gdk-pixbuf"."0.2.0"."glib"}" deps)
-      (crates."glib_sys"."${deps."gdk-pixbuf"."0.2.0"."glib_sys"}" deps)
-      (crates."gobject_sys"."${deps."gdk-pixbuf"."0.2.0"."gobject_sys"}" deps)
-      (crates."libc"."${deps."gdk-pixbuf"."0.2.0"."libc"}" deps)
+      (crates."gdk_pixbuf_sys"."${deps."gdk_pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps)
+      (crates."glib"."${deps."gdk_pixbuf"."0.2.0"."glib"}" deps)
+      (crates."glib_sys"."${deps."gdk_pixbuf"."0.2.0"."glib_sys"}" deps)
+      (crates."gobject_sys"."${deps."gdk_pixbuf"."0.2.0"."gobject_sys"}" deps)
+      (crates."libc"."${deps."gdk_pixbuf"."0.2.0"."libc"}" deps)
     ]);
 
     buildDependencies = mapFeatures features ([
 ]);
-    features = mkFeatures (features."gdk-pixbuf"."0.2.0" or {});
+    features = mkFeatures (features."gdk_pixbuf"."0.2.0" or {});
   };
-  features_.gdk-pixbuf."0.2.0" = deps: f: updateFeatures f (rec {
-    gdk-pixbuf = fold recursiveUpdate {} [
-      { "0.2.0".default = (f.gdk-pixbuf."0.2.0".default or true); }
-      { "0.2.0".gtk-rs-lgpl-docs =
-        (f.gdk-pixbuf."0.2.0".gtk-rs-lgpl-docs or false) ||
-        (f.gdk-pixbuf."0.2.0".embed-lgpl-docs or false) ||
-        (gdk-pixbuf."0.2.0"."embed-lgpl-docs" or false) ||
-        (f.gdk-pixbuf."0.2.0".purge-lgpl-docs or false) ||
-        (gdk-pixbuf."0.2.0"."purge-lgpl-docs" or false); }
-      { "0.2.0".v2_28 =
-        (f.gdk-pixbuf."0.2.0".v2_28 or false) ||
-        (f.gdk-pixbuf."0.2.0".v2_30 or false) ||
-        (gdk-pixbuf."0.2.0"."v2_30" or false); }
-      { "0.2.0".v2_30 =
-        (f.gdk-pixbuf."0.2.0".v2_30 or false) ||
-        (f.gdk-pixbuf."0.2.0".v2_32 or false) ||
-        (gdk-pixbuf."0.2.0"."v2_32" or false); }
-      { "0.2.0".v2_32 =
-        (f.gdk-pixbuf."0.2.0".v2_32 or false) ||
-        (f.gdk-pixbuf."0.2.0".v2_36 or false) ||
-        (gdk-pixbuf."0.2.0"."v2_36" or false); }
+  features_.gdk_pixbuf."0.2.0" = deps: f: updateFeatures f (rec {
+    gdk_pixbuf = fold recursiveUpdate {} [
+      { "0.2.0"."gtk-rs-lgpl-docs" =
+        (f.gdk_pixbuf."0.2.0"."gtk-rs-lgpl-docs" or false) ||
+        (f.gdk_pixbuf."0.2.0".embed-lgpl-docs or false) ||
+        (gdk_pixbuf."0.2.0"."embed-lgpl-docs" or false) ||
+        (f.gdk_pixbuf."0.2.0".purge-lgpl-docs or false) ||
+        (gdk_pixbuf."0.2.0"."purge-lgpl-docs" or false); }
+      { "0.2.0"."v2_28" =
+        (f.gdk_pixbuf."0.2.0"."v2_28" or false) ||
+        (f.gdk_pixbuf."0.2.0".v2_30 or false) ||
+        (gdk_pixbuf."0.2.0"."v2_30" or false); }
+      { "0.2.0"."v2_30" =
+        (f.gdk_pixbuf."0.2.0"."v2_30" or false) ||
+        (f.gdk_pixbuf."0.2.0".v2_32 or false) ||
+        (gdk_pixbuf."0.2.0"."v2_32" or false); }
+      { "0.2.0"."v2_32" =
+        (f.gdk_pixbuf."0.2.0"."v2_32" or false) ||
+        (f.gdk_pixbuf."0.2.0".v2_36 or false) ||
+        (gdk_pixbuf."0.2.0"."v2_36" or false); }
+      { "0.2.0".default = (f.gdk_pixbuf."0.2.0".default or true); }
     ];
     gdk_pixbuf_sys = fold recursiveUpdate {} [
-      { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" =
-        (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" or false) ||
-        (gdk-pixbuf."0.2.0"."v2_28" or false) ||
-        (f."gdk-pixbuf"."0.2.0"."v2_28" or false); }
-      { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" =
-        (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" or false) ||
-        (gdk-pixbuf."0.2.0"."v2_30" or false) ||
-        (f."gdk-pixbuf"."0.2.0"."v2_30" or false); }
-      { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" =
-        (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" or false) ||
-        (gdk-pixbuf."0.2.0"."v2_32" or false) ||
-        (f."gdk-pixbuf"."0.2.0"."v2_32" or false); }
-      { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" =
-        (f.gdk_pixbuf_sys."${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" or false) ||
-        (gdk-pixbuf."0.2.0"."v2_36" or false) ||
-        (f."gdk-pixbuf"."0.2.0"."v2_36" or false); }
-      { "${deps.gdk-pixbuf."0.2.0".gdk_pixbuf_sys}".default = true; }
+      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" =
+        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_28" or false) ||
+        (gdk_pixbuf."0.2.0"."v2_28" or false) ||
+        (f."gdk_pixbuf"."0.2.0"."v2_28" or false); }
+      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" =
+        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_30" or false) ||
+        (gdk_pixbuf."0.2.0"."v2_30" or false) ||
+        (f."gdk_pixbuf"."0.2.0"."v2_30" or false); }
+      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" =
+        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_32" or false) ||
+        (gdk_pixbuf."0.2.0"."v2_32" or false) ||
+        (f."gdk_pixbuf"."0.2.0"."v2_32" or false); }
+      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" =
+        (f.gdk_pixbuf_sys."${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}"."v2_36" or false) ||
+        (gdk_pixbuf."0.2.0"."v2_36" or false) ||
+        (f."gdk_pixbuf"."0.2.0"."v2_36" or false); }
+      { "${deps.gdk_pixbuf."0.2.0".gdk_pixbuf_sys}".default = true; }
     ];
-    glib."${deps.gdk-pixbuf."0.2.0".glib}".default = true;
-    glib_sys."${deps.gdk-pixbuf."0.2.0".glib_sys}".default = true;
-    gobject_sys."${deps.gdk-pixbuf."0.2.0".gobject_sys}".default = true;
-    libc."${deps.gdk-pixbuf."0.2.0".libc}".default = true;
+    glib."${deps.gdk_pixbuf."0.2.0".glib}".default = true;
+    glib_sys."${deps.gdk_pixbuf."0.2.0".glib_sys}".default = true;
+    gobject_sys."${deps.gdk_pixbuf."0.2.0".gobject_sys}".default = true;
+    libc."${deps.gdk_pixbuf."0.2.0".libc}".default = true;
   }) [
-    (features_.gdk_pixbuf_sys."${deps."gdk-pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps)
-    (features_.glib."${deps."gdk-pixbuf"."0.2.0"."glib"}" deps)
-    (features_.glib_sys."${deps."gdk-pixbuf"."0.2.0"."glib_sys"}" deps)
-    (features_.gobject_sys."${deps."gdk-pixbuf"."0.2.0"."gobject_sys"}" deps)
-    (features_.libc."${deps."gdk-pixbuf"."0.2.0"."libc"}" deps)
+    (features_.gdk_pixbuf_sys."${deps."gdk_pixbuf"."0.2.0"."gdk_pixbuf_sys"}" deps)
+    (features_.glib."${deps."gdk_pixbuf"."0.2.0"."glib"}" deps)
+    (features_.glib_sys."${deps."gdk_pixbuf"."0.2.0"."glib_sys"}" deps)
+    (features_.gobject_sys."${deps."gdk_pixbuf"."0.2.0"."gobject_sys"}" deps)
+    (features_.libc."${deps."gdk_pixbuf"."0.2.0"."libc"}" deps)
   ];
 
 
@@ -625,6 +649,7 @@ rec {
   crates.gdk_pixbuf_sys."0.4.0" = deps: { features?(features_.gdk_pixbuf_sys."0.4.0" deps {}) }: buildRustCrate {
     crateName = "gdk-pixbuf-sys";
     version = "0.4.0";
+    description = "FFI bindings to libgdk_pixbuf-2.0";
     authors = [ "The Gtk-rs Project Developers" ];
     sha256 = "1r98zdqqik3hh1l10jmhhcjx59yk4m0bs9pc7hnkwp2p6gm968vp";
     libName = "gdk_pixbuf_sys";
@@ -645,19 +670,19 @@ rec {
   features_.gdk_pixbuf_sys."0.4.0" = deps: f: updateFeatures f (rec {
     bitflags."${deps.gdk_pixbuf_sys."0.4.0".bitflags}".default = true;
     gdk_pixbuf_sys = fold recursiveUpdate {} [
-      { "0.4.0".default = (f.gdk_pixbuf_sys."0.4.0".default or true); }
-      { "0.4.0".v2_28 =
-        (f.gdk_pixbuf_sys."0.4.0".v2_28 or false) ||
+      { "0.4.0"."v2_28" =
+        (f.gdk_pixbuf_sys."0.4.0"."v2_28" or false) ||
         (f.gdk_pixbuf_sys."0.4.0".v2_30 or false) ||
         (gdk_pixbuf_sys."0.4.0"."v2_30" or false); }
-      { "0.4.0".v2_30 =
-        (f.gdk_pixbuf_sys."0.4.0".v2_30 or false) ||
+      { "0.4.0"."v2_30" =
+        (f.gdk_pixbuf_sys."0.4.0"."v2_30" or false) ||
         (f.gdk_pixbuf_sys."0.4.0".v2_32 or false) ||
         (gdk_pixbuf_sys."0.4.0"."v2_32" or false); }
-      { "0.4.0".v2_32 =
-        (f.gdk_pixbuf_sys."0.4.0".v2_32 or false) ||
+      { "0.4.0"."v2_32" =
+        (f.gdk_pixbuf_sys."0.4.0"."v2_32" or false) ||
         (f.gdk_pixbuf_sys."0.4.0".v2_36 or false) ||
         (gdk_pixbuf_sys."0.4.0"."v2_36" or false); }
+      { "0.4.0".default = (f.gdk_pixbuf_sys."0.4.0".default or true); }
     ];
     gio_sys."${deps.gdk_pixbuf_sys."0.4.0".gio_sys}".default = true;
     glib_sys."${deps.gdk_pixbuf_sys."0.4.0".glib_sys}".default = true;
@@ -680,6 +705,7 @@ rec {
   crates.getopts."0.2.18" = deps: { features?(features_.getopts."0.2.18" deps {}) }: buildRustCrate {
     crateName = "getopts";
     version = "0.2.18";
+    description = "getopts-like option parsing.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "0c1m95wg8pkvdq4mwcd2v78r1lb6a5s3ljm7158dsl56mvzcwd5y";
     dependencies = mapFeatures features ([
@@ -700,6 +726,7 @@ rec {
   crates.gio_sys."0.4.0" = deps: { features?(features_.gio_sys."0.4.0" deps {}) }: buildRustCrate {
     crateName = "gio-sys";
     version = "0.4.0";
+    description = "FFI bindings to libgio-2.0";
     authors = [ "The Gtk-rs Project Developers" ];
     sha256 = "064lv6h3qfgjzc6pbbxgln24b2fq9gxzh78z6d7fwfa97azllv2l";
     libName = "gio_sys";
@@ -719,39 +746,39 @@ rec {
   features_.gio_sys."0.4.0" = deps: f: updateFeatures f (rec {
     bitflags."${deps.gio_sys."0.4.0".bitflags}".default = true;
     gio_sys = fold recursiveUpdate {} [
-      { "0.4.0".default = (f.gio_sys."0.4.0".default or true); }
-      { "0.4.0".v2_34 =
-        (f.gio_sys."0.4.0".v2_34 or false) ||
+      { "0.4.0"."v2_34" =
+        (f.gio_sys."0.4.0"."v2_34" or false) ||
         (f.gio_sys."0.4.0".v2_36 or false) ||
         (gio_sys."0.4.0"."v2_36" or false); }
-      { "0.4.0".v2_36 =
-        (f.gio_sys."0.4.0".v2_36 or false) ||
+      { "0.4.0"."v2_36" =
+        (f.gio_sys."0.4.0"."v2_36" or false) ||
         (f.gio_sys."0.4.0".v2_38 or false) ||
         (gio_sys."0.4.0"."v2_38" or false); }
-      { "0.4.0".v2_38 =
-        (f.gio_sys."0.4.0".v2_38 or false) ||
+      { "0.4.0"."v2_38" =
+        (f.gio_sys."0.4.0"."v2_38" or false) ||
         (f.gio_sys."0.4.0".v2_40 or false) ||
         (gio_sys."0.4.0"."v2_40" or false); }
-      { "0.4.0".v2_40 =
-        (f.gio_sys."0.4.0".v2_40 or false) ||
+      { "0.4.0"."v2_40" =
+        (f.gio_sys."0.4.0"."v2_40" or false) ||
         (f.gio_sys."0.4.0".v2_42 or false) ||
         (gio_sys."0.4.0"."v2_42" or false); }
-      { "0.4.0".v2_42 =
-        (f.gio_sys."0.4.0".v2_42 or false) ||
+      { "0.4.0"."v2_42" =
+        (f.gio_sys."0.4.0"."v2_42" or false) ||
         (f.gio_sys."0.4.0".v2_44 or false) ||
         (gio_sys."0.4.0"."v2_44" or false); }
-      { "0.4.0".v2_44 =
-        (f.gio_sys."0.4.0".v2_44 or false) ||
+      { "0.4.0"."v2_44" =
+        (f.gio_sys."0.4.0"."v2_44" or false) ||
         (f.gio_sys."0.4.0".v2_46 or false) ||
         (gio_sys."0.4.0"."v2_46" or false); }
-      { "0.4.0".v2_46 =
-        (f.gio_sys."0.4.0".v2_46 or false) ||
+      { "0.4.0"."v2_46" =
+        (f.gio_sys."0.4.0"."v2_46" or false) ||
         (f.gio_sys."0.4.0".v2_48 or false) ||
         (gio_sys."0.4.0"."v2_48" or false); }
-      { "0.4.0".v2_48 =
-        (f.gio_sys."0.4.0".v2_48 or false) ||
+      { "0.4.0"."v2_48" =
+        (f.gio_sys."0.4.0"."v2_48" or false) ||
         (f.gio_sys."0.4.0".v2_50 or false) ||
         (gio_sys."0.4.0"."v2_50" or false); }
+      { "0.4.0".default = (f.gio_sys."0.4.0".default or true); }
     ];
     glib_sys."${deps.gio_sys."0.4.0".glib_sys}".default = true;
     gobject_sys."${deps.gio_sys."0.4.0".gobject_sys}".default = true;
@@ -772,6 +799,7 @@ rec {
   crates.glib."0.3.1" = deps: { features?(features_.glib."0.3.1" deps {}) }: buildRustCrate {
     crateName = "glib";
     version = "0.3.1";
+    description = "Rust bindings for the GLib library";
     authors = [ "The Gtk-rs Project Developers" ];
     sha256 = "00s3n0pd8by1fk2l01mxmbnqq4ff6wadnkcf9jbjvr1l9bzgyqbl";
     dependencies = mapFeatures features ([
@@ -786,31 +814,31 @@ rec {
   features_.glib."0.3.1" = deps: f: updateFeatures f (rec {
     bitflags."${deps.glib."0.3.1".bitflags}".default = true;
     glib = fold recursiveUpdate {} [
-      { "0.3.1".default = (f.glib."0.3.1".default or true); }
-      { "0.3.1".v2_34 =
-        (f.glib."0.3.1".v2_34 or false) ||
+      { "0.3.1"."v2_34" =
+        (f.glib."0.3.1"."v2_34" or false) ||
         (f.glib."0.3.1".v2_38 or false) ||
         (glib."0.3.1"."v2_38" or false); }
-      { "0.3.1".v2_38 =
-        (f.glib."0.3.1".v2_38 or false) ||
+      { "0.3.1"."v2_38" =
+        (f.glib."0.3.1"."v2_38" or false) ||
         (f.glib."0.3.1".v2_40 or false) ||
         (glib."0.3.1"."v2_40" or false); }
-      { "0.3.1".v2_40 =
-        (f.glib."0.3.1".v2_40 or false) ||
+      { "0.3.1"."v2_40" =
+        (f.glib."0.3.1"."v2_40" or false) ||
         (f.glib."0.3.1".v2_44 or false) ||
         (glib."0.3.1"."v2_44" or false); }
-      { "0.3.1".v2_44 =
-        (f.glib."0.3.1".v2_44 or false) ||
+      { "0.3.1"."v2_44" =
+        (f.glib."0.3.1"."v2_44" or false) ||
         (f.glib."0.3.1".v2_46 or false) ||
         (glib."0.3.1"."v2_46" or false); }
-      { "0.3.1".v2_46 =
-        (f.glib."0.3.1".v2_46 or false) ||
+      { "0.3.1"."v2_46" =
+        (f.glib."0.3.1"."v2_46" or false) ||
         (f.glib."0.3.1".v2_48 or false) ||
         (glib."0.3.1"."v2_48" or false); }
-      { "0.3.1".v2_48 =
-        (f.glib."0.3.1".v2_48 or false) ||
+      { "0.3.1"."v2_48" =
+        (f.glib."0.3.1"."v2_48" or false) ||
         (f.glib."0.3.1".v2_50 or false) ||
         (glib."0.3.1"."v2_50" or false); }
+      { "0.3.1".default = (f.glib."0.3.1".default or true); }
     ];
     glib_sys = fold recursiveUpdate {} [
       { "${deps.glib."0.3.1".glib_sys}"."v2_34" =
@@ -879,6 +907,7 @@ rec {
   crates.glib_sys."0.4.0" = deps: { features?(features_.glib_sys."0.4.0" deps {}) }: buildRustCrate {
     crateName = "glib-sys";
     version = "0.4.0";
+    description = "FFI bindings to libglib-2.0";
     authors = [ "The Gtk-rs Project Developers" ];
     sha256 = "153i1zmk824hdf8agkaqcgddlwpvgng71n7bdpaav5f4zzlfyp2w";
     libName = "glib_sys";
@@ -896,35 +925,35 @@ rec {
   features_.glib_sys."0.4.0" = deps: f: updateFeatures f (rec {
     bitflags."${deps.glib_sys."0.4.0".bitflags}".default = true;
     glib_sys = fold recursiveUpdate {} [
-      { "0.4.0".default = (f.glib_sys."0.4.0".default or true); }
-      { "0.4.0".v2_34 =
-        (f.glib_sys."0.4.0".v2_34 or false) ||
+      { "0.4.0"."v2_34" =
+        (f.glib_sys."0.4.0"."v2_34" or false) ||
         (f.glib_sys."0.4.0".v2_36 or false) ||
         (glib_sys."0.4.0"."v2_36" or false); }
-      { "0.4.0".v2_36 =
-        (f.glib_sys."0.4.0".v2_36 or false) ||
+      { "0.4.0"."v2_36" =
+        (f.glib_sys."0.4.0"."v2_36" or false) ||
         (f.glib_sys."0.4.0".v2_38 or false) ||
         (glib_sys."0.4.0"."v2_38" or false); }
-      { "0.4.0".v2_38 =
-        (f.glib_sys."0.4.0".v2_38 or false) ||
+      { "0.4.0"."v2_38" =
+        (f.glib_sys."0.4.0"."v2_38" or false) ||
         (f.glib_sys."0.4.0".v2_40 or false) ||
         (glib_sys."0.4.0"."v2_40" or false); }
-      { "0.4.0".v2_40 =
-        (f.glib_sys."0.4.0".v2_40 or false) ||
+      { "0.4.0"."v2_40" =
+        (f.glib_sys."0.4.0"."v2_40" or false) ||
         (f.glib_sys."0.4.0".v2_44 or false) ||
         (glib_sys."0.4.0"."v2_44" or false); }
-      { "0.4.0".v2_44 =
-        (f.glib_sys."0.4.0".v2_44 or false) ||
+      { "0.4.0"."v2_44" =
+        (f.glib_sys."0.4.0"."v2_44" or false) ||
         (f.glib_sys."0.4.0".v2_46 or false) ||
         (glib_sys."0.4.0"."v2_46" or false); }
-      { "0.4.0".v2_46 =
-        (f.glib_sys."0.4.0".v2_46 or false) ||
+      { "0.4.0"."v2_46" =
+        (f.glib_sys."0.4.0"."v2_46" or false) ||
         (f.glib_sys."0.4.0".v2_48 or false) ||
         (glib_sys."0.4.0"."v2_48" or false); }
-      { "0.4.0".v2_48 =
-        (f.glib_sys."0.4.0".v2_48 or false) ||
+      { "0.4.0"."v2_48" =
+        (f.glib_sys."0.4.0"."v2_48" or false) ||
         (f.glib_sys."0.4.0".v2_50 or false) ||
         (glib_sys."0.4.0"."v2_50" or false); }
+      { "0.4.0".default = (f.glib_sys."0.4.0".default or true); }
     ];
     libc."${deps.glib_sys."0.4.0".libc}".default = true;
     pkg_config."${deps.glib_sys."0.4.0".pkg_config}".default = true;
@@ -941,6 +970,7 @@ rec {
   crates.gobject_sys."0.4.0" = deps: { features?(features_.gobject_sys."0.4.0" deps {}) }: buildRustCrate {
     crateName = "gobject-sys";
     version = "0.4.0";
+    description = "FFI bindings to libgobject-2.0";
     authors = [ "The Gtk-rs Project Developers" ];
     sha256 = "00zmcbzqfhn9w01cphhf3hbq8ldd9ajba7x07z59vv1gdq6wjzli";
     libName = "gobject_sys";
@@ -960,27 +990,27 @@ rec {
     bitflags."${deps.gobject_sys."0.4.0".bitflags}".default = true;
     glib_sys."${deps.gobject_sys."0.4.0".glib_sys}".default = true;
     gobject_sys = fold recursiveUpdate {} [
-      { "0.4.0".default = (f.gobject_sys."0.4.0".default or true); }
-      { "0.4.0".v2_34 =
-        (f.gobject_sys."0.4.0".v2_34 or false) ||
+      { "0.4.0"."v2_34" =
+        (f.gobject_sys."0.4.0"."v2_34" or false) ||
         (f.gobject_sys."0.4.0".v2_36 or false) ||
         (gobject_sys."0.4.0"."v2_36" or false); }
-      { "0.4.0".v2_36 =
-        (f.gobject_sys."0.4.0".v2_36 or false) ||
+      { "0.4.0"."v2_36" =
+        (f.gobject_sys."0.4.0"."v2_36" or false) ||
         (f.gobject_sys."0.4.0".v2_38 or false) ||
         (gobject_sys."0.4.0"."v2_38" or false); }
-      { "0.4.0".v2_38 =
-        (f.gobject_sys."0.4.0".v2_38 or false) ||
+      { "0.4.0"."v2_38" =
+        (f.gobject_sys."0.4.0"."v2_38" or false) ||
         (f.gobject_sys."0.4.0".v2_42 or false) ||
         (gobject_sys."0.4.0"."v2_42" or false); }
-      { "0.4.0".v2_42 =
-        (f.gobject_sys."0.4.0".v2_42 or false) ||
+      { "0.4.0"."v2_42" =
+        (f.gobject_sys."0.4.0"."v2_42" or false) ||
         (f.gobject_sys."0.4.0".v2_44 or false) ||
         (gobject_sys."0.4.0"."v2_44" or false); }
-      { "0.4.0".v2_44 =
-        (f.gobject_sys."0.4.0".v2_44 or false) ||
+      { "0.4.0"."v2_44" =
+        (f.gobject_sys."0.4.0"."v2_44" or false) ||
         (f.gobject_sys."0.4.0".v2_46 or false) ||
         (gobject_sys."0.4.0"."v2_46" or false); }
+      { "0.4.0".default = (f.gobject_sys."0.4.0".default or true); }
     ];
     libc."${deps.gobject_sys."0.4.0".libc}".default = true;
     pkg_config."${deps.gobject_sys."0.4.0".pkg_config}".default = true;
@@ -998,6 +1028,7 @@ rec {
   crates.itoa."0.3.4" = deps: { features?(features_.itoa."0.3.4" deps {}) }: buildRustCrate {
     crateName = "itoa";
     version = "0.3.4";
+    description = "Fast functions for printing integer primitives to an io::Write";
     authors = [ "David Tolnay <dtolnay@gmail.com>" ];
     sha256 = "1nfkzz6vrgj0d9l3yzjkkkqzdgs68y294fjdbl7jq118qi8xc9d9";
     features = mkFeatures (features."itoa"."0.3.4" or {});
@@ -1013,6 +1044,7 @@ rec {
   crates.json_macro."0.1.1" = deps: { features?(features_.json_macro."0.1.1" deps {}) }: buildRustCrate {
     crateName = "json_macro";
     version = "0.1.1";
+    description = "Pure json macro for rust_serialize. No need compiler features.";
     authors = [ "Denis Kolodin <deniskolodin@gmail.com>" ];
     sha256 = "0hl2934shpwqbszrq035valbdz9y8p7dza183brygy5dbvivcyqy";
     dependencies = mapFeatures features ([
@@ -1033,6 +1065,7 @@ rec {
   crates.kernel32_sys."0.2.2" = deps: { features?(features_.kernel32_sys."0.2.2" deps {}) }: buildRustCrate {
     crateName = "kernel32-sys";
     version = "0.2.2";
+    description = "Contains function definitions for the Windows API library kernel32. See winapi for types and constants.";
     authors = [ "Peter Atashian <retep998@gmail.com>" ];
     sha256 = "1lrw1hbinyvr6cp28g60z97w32w8vsk6pahk64pmrv2fmby8srfj";
     libName = "kernel32";
@@ -1061,6 +1094,7 @@ rec {
   crates.lazy_static."0.2.11" = deps: { features?(features_.lazy_static."0.2.11" deps {}) }: buildRustCrate {
     crateName = "lazy_static";
     version = "0.2.11";
+    description = "A macro for declaring lazily evaluated statics in Rust.";
     authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
     sha256 = "1x6871cvpy5b96yv4c7jvpq316fp5d4609s9py7qk6cd6x9k34vm";
     dependencies = mapFeatures features ([
@@ -1069,19 +1103,19 @@ rec {
   };
   features_.lazy_static."0.2.11" = deps: f: updateFeatures f (rec {
     lazy_static = fold recursiveUpdate {} [
-      { "0.2.11".compiletest_rs =
-        (f.lazy_static."0.2.11".compiletest_rs or false) ||
+      { "0.2.11"."compiletest_rs" =
+        (f.lazy_static."0.2.11"."compiletest_rs" or false) ||
         (f.lazy_static."0.2.11".compiletest or false) ||
         (lazy_static."0.2.11"."compiletest" or false); }
+      { "0.2.11"."nightly" =
+        (f.lazy_static."0.2.11"."nightly" or false) ||
+        (f.lazy_static."0.2.11".spin_no_std or false) ||
+        (lazy_static."0.2.11"."spin_no_std" or false); }
+      { "0.2.11"."spin" =
+        (f.lazy_static."0.2.11"."spin" or false) ||
+        (f.lazy_static."0.2.11".spin_no_std or false) ||
+        (lazy_static."0.2.11"."spin_no_std" or false); }
       { "0.2.11".default = (f.lazy_static."0.2.11".default or true); }
-      { "0.2.11".nightly =
-        (f.lazy_static."0.2.11".nightly or false) ||
-        (f.lazy_static."0.2.11".spin_no_std or false) ||
-        (lazy_static."0.2.11"."spin_no_std" or false); }
-      { "0.2.11".spin =
-        (f.lazy_static."0.2.11".spin or false) ||
-        (f.lazy_static."0.2.11".spin_no_std or false) ||
-        (lazy_static."0.2.11"."spin_no_std" or false); }
     ];
   }) [];
 
@@ -1092,6 +1126,7 @@ rec {
   crates.lazy_static."1.2.0" = deps: { features?(features_.lazy_static."1.2.0" deps {}) }: buildRustCrate {
     crateName = "lazy_static";
     version = "1.2.0";
+    description = "A macro for declaring lazily evaluated statics in Rust.";
     authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
     sha256 = "07p3b30k2akyr6xw08ggd5qiz5nw3vd3agggj360fcc1njz7d0ss";
     dependencies = mapFeatures features ([
@@ -1100,11 +1135,11 @@ rec {
   };
   features_.lazy_static."1.2.0" = deps: f: updateFeatures f (rec {
     lazy_static = fold recursiveUpdate {} [
-      { "1.2.0".default = (f.lazy_static."1.2.0".default or true); }
-      { "1.2.0".spin =
-        (f.lazy_static."1.2.0".spin or false) ||
+      { "1.2.0"."spin" =
+        (f.lazy_static."1.2.0"."spin" or false) ||
         (f.lazy_static."1.2.0".spin_no_std or false) ||
         (lazy_static."1.2.0"."spin_no_std" or false); }
+      { "1.2.0".default = (f.lazy_static."1.2.0".default or true); }
     ];
   }) [];
 
@@ -1115,6 +1150,7 @@ rec {
   crates.libc."0.2.44" = deps: { features?(features_.libc."0.2.44" deps {}) }: buildRustCrate {
     crateName = "libc";
     version = "0.2.44";
+    description = "A library for types and bindings to native C functions often found in libc or\nother common platform libraries.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "17a7p0lcf3qwl1pcxffdflgnx8zr2659mgzzg4zi5fnv1mlj3q6z";
     build = "build.rs";
@@ -1124,19 +1160,19 @@ rec {
   };
   features_.libc."0.2.44" = deps: f: updateFeatures f (rec {
     libc = fold recursiveUpdate {} [
-      { "0.2.44".align =
-        (f.libc."0.2.44".align or false) ||
+      { "0.2.44"."align" =
+        (f.libc."0.2.44"."align" or false) ||
         (f.libc."0.2.44".rustc-dep-of-std or false) ||
         (libc."0.2.44"."rustc-dep-of-std" or false); }
-      { "0.2.44".default = (f.libc."0.2.44".default or true); }
-      { "0.2.44".rustc-std-workspace-core =
-        (f.libc."0.2.44".rustc-std-workspace-core or false) ||
+      { "0.2.44"."rustc-std-workspace-core" =
+        (f.libc."0.2.44"."rustc-std-workspace-core" or false) ||
         (f.libc."0.2.44".rustc-dep-of-std or false) ||
         (libc."0.2.44"."rustc-dep-of-std" or false); }
-      { "0.2.44".use_std =
-        (f.libc."0.2.44".use_std or false) ||
+      { "0.2.44"."use_std" =
+        (f.libc."0.2.44"."use_std" or false) ||
         (f.libc."0.2.44".default or false) ||
         (libc."0.2.44"."default" or false); }
+      { "0.2.44".default = (f.libc."0.2.44".default or true); }
     ];
   }) [];
 
@@ -1147,6 +1183,7 @@ rec {
   crates.libloading."0.3.4" = deps: { features?(features_.libloading."0.3.4" deps {}) }: buildRustCrate {
     crateName = "libloading";
     version = "0.3.4";
+    description = "A safer binding to platform’s dynamic library loading utilities";
     authors = [ "Simonas Kazlauskas <libloading@kazlauskas.me>" ];
     sha256 = "1f2vy32cr434n638nv8sdf05iwa53q9q5ahlcpw1l9ywh1bcbhf1";
     build = "build.rs";
@@ -1182,6 +1219,7 @@ rec {
   crates.libloading."0.5.0" = deps: { features?(features_.libloading."0.5.0" deps {}) }: buildRustCrate {
     crateName = "libloading";
     version = "0.5.0";
+    description = "A safer binding to platform’s dynamic library loading utilities";
     authors = [ "Simonas Kazlauskas <libloading@kazlauskas.me>" ];
     sha256 = "11vzjaka1y979aril4ggwp33p35yz2isvx9m5w88r5sdcmq6iscn";
     build = "build.rs";
@@ -1214,6 +1252,7 @@ rec {
   crates.log."0.3.9" = deps: { features?(features_.log."0.3.9" deps {}) }: buildRustCrate {
     crateName = "log";
     version = "0.3.9";
+    description = "A lightweight logging facade for Rust\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "19i9pwp7lhaqgzangcpw00kc3zsgcqcx84crv07xgz3v7d3kvfa2";
     dependencies = mapFeatures features ([
@@ -1276,11 +1315,11 @@ rec {
         (log."0.3.9"."use_std" or false) ||
         (f."log"."0.3.9"."use_std" or false); }
       { "${deps.log."0.3.9".log}".default = true; }
-      { "0.3.9".default = (f.log."0.3.9".default or true); }
-      { "0.3.9".use_std =
-        (f.log."0.3.9".use_std or false) ||
+      { "0.3.9"."use_std" =
+        (f.log."0.3.9"."use_std" or false) ||
         (f.log."0.3.9".default or false) ||
         (log."0.3.9"."default" or false); }
+      { "0.3.9".default = (f.log."0.3.9".default or true); }
     ];
   }) [
     (features_.log."${deps."log"."0.3.9"."log"}" deps)
@@ -1293,6 +1332,7 @@ rec {
   crates.log."0.4.6" = deps: { features?(features_.log."0.4.6" deps {}) }: buildRustCrate {
     crateName = "log";
     version = "0.4.6";
+    description = "A lightweight logging facade for Rust\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1nd8dl9mvc9vd6fks5d4gsxaz990xi6rzlb8ymllshmwi153vngr";
     dependencies = mapFeatures features ([
@@ -1314,6 +1354,7 @@ rec {
   crates.memchr."0.1.11" = deps: { features?(features_.memchr."0.1.11" deps {}) }: buildRustCrate {
     crateName = "memchr";
     version = "0.1.11";
+    description = "Safe interface to memchr.";
     authors = [ "Andrew Gallant <jamslam@gmail.com>" "bluss" ];
     sha256 = "0x73jghamvxxq5fsw9wb0shk5m6qp3q6fsf0nibn0i6bbqkw91s8";
     dependencies = mapFeatures features ([
@@ -1334,6 +1375,7 @@ rec {
   crates.nix."0.6.0" = deps: { features?(features_.nix."0.6.0" deps {}) }: buildRustCrate {
     crateName = "nix";
     version = "0.6.0";
+    description = "Rust friendly bindings to *nix APIs";
     authors = [ "Carl Lerche <me@carllerche.com>" ];
     sha256 = "1bgh75y897isnxbw3vd79vns9h6q4d59p1cgv9c4laysyw6fkqwf";
     build = "build.rs";
@@ -1374,6 +1416,7 @@ rec {
   crates.nix."0.9.0" = deps: { features?(features_.nix."0.9.0" deps {}) }: buildRustCrate {
     crateName = "nix";
     version = "0.9.0";
+    description = "Rust friendly bindings to *nix APIs";
     authors = [ "The nix-rust Project Developers" ];
     sha256 = "00p63bphzwwn460rja5l2wcpgmv7ljf7illf6n95cppx63d180q0";
     dependencies = mapFeatures features ([
@@ -1403,6 +1446,7 @@ rec {
   crates.num_traits."0.1.43" = deps: { features?(features_.num_traits."0.1.43" deps {}) }: buildRustCrate {
     crateName = "num-traits";
     version = "0.1.43";
+    description = "Numeric traits for generic mathematics";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1zdzx78vrcg3f39w94pqjs1mwxl1phyv7843hwgwkzggwcxhhf6s";
     dependencies = mapFeatures features ([
@@ -1425,6 +1469,7 @@ rec {
   crates.num_traits."0.2.6" = deps: { features?(features_.num_traits."0.2.6" deps {}) }: buildRustCrate {
     crateName = "num-traits";
     version = "0.2.6";
+    description = "Numeric traits for generic mathematics";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1d20sil9n0wgznd1nycm3yjfj1mzyl41ambb7by1apxlyiil1azk";
     build = "build.rs";
@@ -1432,11 +1477,11 @@ rec {
   };
   features_.num_traits."0.2.6" = deps: f: updateFeatures f (rec {
     num_traits = fold recursiveUpdate {} [
-      { "0.2.6".default = (f.num_traits."0.2.6".default or true); }
-      { "0.2.6".std =
-        (f.num_traits."0.2.6".std or false) ||
+      { "0.2.6"."std" =
+        (f.num_traits."0.2.6"."std" or false) ||
         (f.num_traits."0.2.6".default or false) ||
         (num_traits."0.2.6"."default" or false); }
+      { "0.2.6".default = (f.num_traits."0.2.6".default or true); }
     ];
   }) [];
 
@@ -1447,6 +1492,7 @@ rec {
   crates.ordermap."0.3.5" = deps: { features?(features_.ordermap."0.3.5" deps {}) }: buildRustCrate {
     crateName = "ordermap";
     version = "0.3.5";
+    description = "A hash table with consistent order and fast iteration.";
     authors = [ "bluss" ];
     sha256 = "0b6vxfyh627yqm6war3392g1hhi4dbn49ibx2qv6mv490jdhv7d3";
     dependencies = mapFeatures features ([
@@ -1455,11 +1501,11 @@ rec {
   };
   features_.ordermap."0.3.5" = deps: f: updateFeatures f (rec {
     ordermap = fold recursiveUpdate {} [
-      { "0.3.5".default = (f.ordermap."0.3.5".default or true); }
-      { "0.3.5".serde =
-        (f.ordermap."0.3.5".serde or false) ||
+      { "0.3.5"."serde" =
+        (f.ordermap."0.3.5"."serde" or false) ||
         (f.ordermap."0.3.5".serde-1 or false) ||
         (ordermap."0.3.5"."serde-1" or false); }
+      { "0.3.5".default = (f.ordermap."0.3.5".default or true); }
     ];
   }) [];
 
@@ -1470,6 +1516,7 @@ rec {
   crates.petgraph."0.4.13" = deps: { features?(features_.petgraph."0.4.13" deps {}) }: buildRustCrate {
     crateName = "petgraph";
     version = "0.4.13";
+    description = "Graph data structure library. Provides graph types and graph algorithms.";
     authors = [ "bluss" "mitchmindtree" ];
     sha256 = "0a8k12b9vd0bndwqhafa853w186axdw05bv4kqjimyaz67428g1i";
     dependencies = mapFeatures features ([
@@ -1482,43 +1529,43 @@ rec {
     fixedbitset."${deps.petgraph."0.4.13".fixedbitset}".default = true;
     ordermap."${deps.petgraph."0.4.13".ordermap}".default = true;
     petgraph = fold recursiveUpdate {} [
-      { "0.4.13".default = (f.petgraph."0.4.13".default or true); }
-      { "0.4.13".generate =
-        (f.petgraph."0.4.13".generate or false) ||
+      { "0.4.13"."generate" =
+        (f.petgraph."0.4.13"."generate" or false) ||
         (f.petgraph."0.4.13".unstable or false) ||
         (petgraph."0.4.13"."unstable" or false); }
-      { "0.4.13".graphmap =
-        (f.petgraph."0.4.13".graphmap or false) ||
+      { "0.4.13"."graphmap" =
+        (f.petgraph."0.4.13"."graphmap" or false) ||
         (f.petgraph."0.4.13".all or false) ||
         (petgraph."0.4.13"."all" or false) ||
         (f.petgraph."0.4.13".default or false) ||
         (petgraph."0.4.13"."default" or false); }
-      { "0.4.13".ordermap =
-        (f.petgraph."0.4.13".ordermap or false) ||
+      { "0.4.13"."ordermap" =
+        (f.petgraph."0.4.13"."ordermap" or false) ||
         (f.petgraph."0.4.13".graphmap or false) ||
         (petgraph."0.4.13"."graphmap" or false); }
-      { "0.4.13".quickcheck =
-        (f.petgraph."0.4.13".quickcheck or false) ||
+      { "0.4.13"."quickcheck" =
+        (f.petgraph."0.4.13"."quickcheck" or false) ||
         (f.petgraph."0.4.13".all or false) ||
         (petgraph."0.4.13"."all" or false); }
-      { "0.4.13".serde =
-        (f.petgraph."0.4.13".serde or false) ||
+      { "0.4.13"."serde" =
+        (f.petgraph."0.4.13"."serde" or false) ||
         (f.petgraph."0.4.13".serde-1 or false) ||
         (petgraph."0.4.13"."serde-1" or false); }
-      { "0.4.13".serde_derive =
-        (f.petgraph."0.4.13".serde_derive or false) ||
+      { "0.4.13"."serde_derive" =
+        (f.petgraph."0.4.13"."serde_derive" or false) ||
         (f.petgraph."0.4.13".serde-1 or false) ||
         (petgraph."0.4.13"."serde-1" or false); }
-      { "0.4.13".stable_graph =
-        (f.petgraph."0.4.13".stable_graph or false) ||
+      { "0.4.13"."stable_graph" =
+        (f.petgraph."0.4.13"."stable_graph" or false) ||
         (f.petgraph."0.4.13".all or false) ||
         (petgraph."0.4.13"."all" or false) ||
         (f.petgraph."0.4.13".default or false) ||
         (petgraph."0.4.13"."default" or false); }
-      { "0.4.13".unstable =
-        (f.petgraph."0.4.13".unstable or false) ||
+      { "0.4.13"."unstable" =
+        (f.petgraph."0.4.13"."unstable" or false) ||
         (f.petgraph."0.4.13".all or false) ||
         (petgraph."0.4.13"."all" or false); }
+      { "0.4.13".default = (f.petgraph."0.4.13".default or true); }
     ];
   }) [
     (features_.fixedbitset."${deps."petgraph"."0.4.13"."fixedbitset"}" deps)
@@ -1532,6 +1579,7 @@ rec {
   crates.phf."0.7.23" = deps: { features?(features_.phf."0.7.23" deps {}) }: buildRustCrate {
     crateName = "phf";
     version = "0.7.23";
+    description = "Runtime support for perfect hash function data structures";
     authors = [ "Steven Fackler <sfackler@gmail.com>" ];
     sha256 = "0annmaf9mmm12g2cdwpip32p674pmsf6xpiwa27mz3glmz73y8aq";
     libPath = "src/lib.rs";
@@ -1564,6 +1612,7 @@ rec {
   crates.phf_codegen."0.7.23" = deps: { features?(features_.phf_codegen."0.7.23" deps {}) }: buildRustCrate {
     crateName = "phf_codegen";
     version = "0.7.23";
+    description = "Codegen library for PHF types";
     authors = [ "Steven Fackler <sfackler@gmail.com>" ];
     sha256 = "0k5ly0qykw56fxd19iy236wzghqdxq9zxnzcg8nm22cfzw4a35n0";
     dependencies = mapFeatures features ([
@@ -1587,6 +1636,7 @@ rec {
   crates.phf_generator."0.7.23" = deps: { features?(features_.phf_generator."0.7.23" deps {}) }: buildRustCrate {
     crateName = "phf_generator";
     version = "0.7.23";
+    description = "PHF generation logic";
     authors = [ "Steven Fackler <sfackler@gmail.com>" ];
     sha256 = "106cd0bx3jf7mf2gaa8nx62c1las1w95c5gwsd4yqm5lj2rj4mza";
     dependencies = mapFeatures features ([
@@ -1610,6 +1660,7 @@ rec {
   crates.phf_shared."0.7.23" = deps: { features?(features_.phf_shared."0.7.23" deps {}) }: buildRustCrate {
     crateName = "phf_shared";
     version = "0.7.23";
+    description = "Support code shared by PHF libraries";
     authors = [ "Steven Fackler <sfackler@gmail.com>" ];
     sha256 = "04gzsq9vg9j8cr39hpkddxb0yqjdknvcpnylw112rqamy7ml4fy1";
     libPath = "src/lib.rs";
@@ -1632,6 +1683,7 @@ rec {
   crates.pkg_config."0.3.14" = deps: { features?(features_.pkg_config."0.3.14" deps {}) }: buildRustCrate {
     crateName = "pkg-config";
     version = "0.3.14";
+    description = "A library to run the pkg-config system tool at build time in order to be used in\nCargo build scripts.\n";
     authors = [ "Alex Crichton <alex@alexcrichton.com>" ];
     sha256 = "0207fsarrm412j0dh87lfcas72n8mxar7q3mgflsbsrqnb140sv6";
   };
@@ -1646,6 +1698,7 @@ rec {
   crates.rand."0.3.22" = deps: { features?(features_.rand."0.3.22" deps {}) }: buildRustCrate {
     crateName = "rand";
     version = "0.3.22";
+    description = "Random number generators and other randomness functionality.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "0wrj12acx7l4hr7ag3nz8b50yhp8ancyq988bzmnnsxln67rsys0";
     dependencies = mapFeatures features ([
@@ -1662,11 +1715,11 @@ rec {
     libc."${deps.rand."0.3.22".libc}".default = true;
     rand = fold recursiveUpdate {} [
       { "${deps.rand."0.3.22".rand}".default = true; }
-      { "0.3.22".default = (f.rand."0.3.22".default or true); }
-      { "0.3.22".i128_support =
-        (f.rand."0.3.22".i128_support or false) ||
+      { "0.3.22"."i128_support" =
+        (f.rand."0.3.22"."i128_support" or false) ||
         (f.rand."0.3.22".nightly or false) ||
         (rand."0.3.22"."nightly" or false); }
+      { "0.3.22".default = (f.rand."0.3.22".default or true); }
     ];
   }) [
     (features_.libc."${deps."rand"."0.3.22"."libc"}" deps)
@@ -1681,6 +1734,7 @@ rec {
   crates.rand."0.4.3" = deps: { features?(features_.rand."0.4.3" deps {}) }: buildRustCrate {
     crateName = "rand";
     version = "0.4.3";
+    description = "Random number generators and other randomness functionality.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1644wri45l147822xy7dgdm4k7myxzs66cb795ga0x7dan11ci4f";
     dependencies = (if kernel == "fuchsia" then mapFeatures features ([
@@ -1698,19 +1752,19 @@ rec {
     fuchsia_zircon."${deps.rand."0.4.3".fuchsia_zircon}".default = true;
     libc."${deps.rand."0.4.3".libc}".default = true;
     rand = fold recursiveUpdate {} [
-      { "0.4.3".default = (f.rand."0.4.3".default or true); }
-      { "0.4.3".i128_support =
-        (f.rand."0.4.3".i128_support or false) ||
+      { "0.4.3"."i128_support" =
+        (f.rand."0.4.3"."i128_support" or false) ||
         (f.rand."0.4.3".nightly or false) ||
         (rand."0.4.3"."nightly" or false); }
-      { "0.4.3".libc =
-        (f.rand."0.4.3".libc or false) ||
+      { "0.4.3"."libc" =
+        (f.rand."0.4.3"."libc" or false) ||
         (f.rand."0.4.3".std or false) ||
         (rand."0.4.3"."std" or false); }
-      { "0.4.3".std =
-        (f.rand."0.4.3".std or false) ||
+      { "0.4.3"."std" =
+        (f.rand."0.4.3"."std" or false) ||
         (f.rand."0.4.3".default or false) ||
         (rand."0.4.3"."default" or false); }
+      { "0.4.3".default = (f.rand."0.4.3".default or true); }
     ];
     winapi = fold recursiveUpdate {} [
       { "${deps.rand."0.4.3".winapi}"."minwindef" = true; }
@@ -1732,6 +1786,7 @@ rec {
   crates.rand."0.5.5" = deps: { features?(features_.rand."0.5.5" deps {}) }: buildRustCrate {
     crateName = "rand";
     version = "0.5.5";
+    description = "Random number generators and other randomness functionality.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "0d7pnsh57qxhz1ghrzk113ddkn13kf2g758ffnbxq4nhwjfzhlc9";
     dependencies = mapFeatures features ([
@@ -1758,43 +1813,43 @@ rec {
     fuchsia_zircon."${deps.rand."0.5.5".fuchsia_zircon}".default = true;
     libc."${deps.rand."0.5.5".libc}".default = true;
     rand = fold recursiveUpdate {} [
-      { "0.5.5".alloc =
-        (f.rand."0.5.5".alloc or false) ||
+      { "0.5.5"."alloc" =
+        (f.rand."0.5.5"."alloc" or false) ||
         (f.rand."0.5.5".std or false) ||
         (rand."0.5.5"."std" or false); }
-      { "0.5.5".cloudabi =
-        (f.rand."0.5.5".cloudabi or false) ||
+      { "0.5.5"."cloudabi" =
+        (f.rand."0.5.5"."cloudabi" or false) ||
+        (f.rand."0.5.5".std or false) ||
+        (rand."0.5.5"."std" or false); }
+      { "0.5.5"."fuchsia-zircon" =
+        (f.rand."0.5.5"."fuchsia-zircon" or false) ||
+        (f.rand."0.5.5".std or false) ||
+        (rand."0.5.5"."std" or false); }
+      { "0.5.5"."i128_support" =
+        (f.rand."0.5.5"."i128_support" or false) ||
+        (f.rand."0.5.5".nightly or false) ||
+        (rand."0.5.5"."nightly" or false); }
+      { "0.5.5"."libc" =
+        (f.rand."0.5.5"."libc" or false) ||
+        (f.rand."0.5.5".std or false) ||
+        (rand."0.5.5"."std" or false); }
+      { "0.5.5"."serde" =
+        (f.rand."0.5.5"."serde" or false) ||
+        (f.rand."0.5.5".serde1 or false) ||
+        (rand."0.5.5"."serde1" or false); }
+      { "0.5.5"."serde_derive" =
+        (f.rand."0.5.5"."serde_derive" or false) ||
+        (f.rand."0.5.5".serde1 or false) ||
+        (rand."0.5.5"."serde1" or false); }
+      { "0.5.5"."std" =
+        (f.rand."0.5.5"."std" or false) ||
+        (f.rand."0.5.5".default or false) ||
+        (rand."0.5.5"."default" or false); }
+      { "0.5.5"."winapi" =
+        (f.rand."0.5.5"."winapi" or false) ||
         (f.rand."0.5.5".std or false) ||
         (rand."0.5.5"."std" or false); }
       { "0.5.5".default = (f.rand."0.5.5".default or true); }
-      { "0.5.5".fuchsia-zircon =
-        (f.rand."0.5.5".fuchsia-zircon or false) ||
-        (f.rand."0.5.5".std or false) ||
-        (rand."0.5.5"."std" or false); }
-      { "0.5.5".i128_support =
-        (f.rand."0.5.5".i128_support or false) ||
-        (f.rand."0.5.5".nightly or false) ||
-        (rand."0.5.5"."nightly" or false); }
-      { "0.5.5".libc =
-        (f.rand."0.5.5".libc or false) ||
-        (f.rand."0.5.5".std or false) ||
-        (rand."0.5.5"."std" or false); }
-      { "0.5.5".serde =
-        (f.rand."0.5.5".serde or false) ||
-        (f.rand."0.5.5".serde1 or false) ||
-        (rand."0.5.5"."serde1" or false); }
-      { "0.5.5".serde_derive =
-        (f.rand."0.5.5".serde_derive or false) ||
-        (f.rand."0.5.5".serde1 or false) ||
-        (rand."0.5.5"."serde1" or false); }
-      { "0.5.5".std =
-        (f.rand."0.5.5".std or false) ||
-        (f.rand."0.5.5".default or false) ||
-        (rand."0.5.5"."default" or false); }
-      { "0.5.5".winapi =
-        (f.rand."0.5.5".winapi or false) ||
-        (f.rand."0.5.5".std or false) ||
-        (rand."0.5.5"."std" or false); }
     ];
     rand_core = fold recursiveUpdate {} [
       { "${deps.rand."0.5.5".rand_core}"."alloc" =
@@ -1833,6 +1888,7 @@ rec {
   crates.rand_core."0.2.2" = deps: { features?(features_.rand_core."0.2.2" deps {}) }: buildRustCrate {
     crateName = "rand_core";
     version = "0.2.2";
+    description = "Core random number generator traits and tools for implementation.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1cxnaxmsirz2wxsajsjkd1wk6lqfqbcprqkha4bq3didznrl22sc";
     dependencies = mapFeatures features ([
@@ -1868,6 +1924,7 @@ rec {
   crates.rand_core."0.3.0" = deps: { features?(features_.rand_core."0.3.0" deps {}) }: buildRustCrate {
     crateName = "rand_core";
     version = "0.3.0";
+    description = "Core random number generator traits and tools for implementation.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1vafw316apjys9va3j987s02djhqp7y21v671v3ix0p5j9bjq339";
     dependencies = mapFeatures features ([
@@ -1876,23 +1933,23 @@ rec {
   };
   features_.rand_core."0.3.0" = deps: f: updateFeatures f (rec {
     rand_core = fold recursiveUpdate {} [
-      { "0.3.0".alloc =
-        (f.rand_core."0.3.0".alloc or false) ||
+      { "0.3.0"."alloc" =
+        (f.rand_core."0.3.0"."alloc" or false) ||
         (f.rand_core."0.3.0".std or false) ||
         (rand_core."0.3.0"."std" or false); }
-      { "0.3.0".default = (f.rand_core."0.3.0".default or true); }
-      { "0.3.0".serde =
-        (f.rand_core."0.3.0".serde or false) ||
+      { "0.3.0"."serde" =
+        (f.rand_core."0.3.0"."serde" or false) ||
         (f.rand_core."0.3.0".serde1 or false) ||
         (rand_core."0.3.0"."serde1" or false); }
-      { "0.3.0".serde_derive =
-        (f.rand_core."0.3.0".serde_derive or false) ||
+      { "0.3.0"."serde_derive" =
+        (f.rand_core."0.3.0"."serde_derive" or false) ||
         (f.rand_core."0.3.0".serde1 or false) ||
         (rand_core."0.3.0"."serde1" or false); }
-      { "0.3.0".std =
-        (f.rand_core."0.3.0".std or false) ||
+      { "0.3.0"."std" =
+        (f.rand_core."0.3.0"."std" or false) ||
         (f.rand_core."0.3.0".default or false) ||
         (rand_core."0.3.0"."default" or false); }
+      { "0.3.0".default = (f.rand_core."0.3.0".default or true); }
     ];
   }) [];
 
@@ -1903,6 +1960,7 @@ rec {
   crates.regex."0.1.80" = deps: { features?(features_.regex."0.1.80" deps {}) }: buildRustCrate {
     crateName = "regex";
     version = "0.1.80";
+    description = "An implementation of regular expressions for Rust. This implementation uses\nfinite automata and guarantees linear time matching on all inputs.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "0y4s8ghhx6sgzb35irwivm3w0l2hhqhmdcd2px9hirqnkagal9l6";
     dependencies = mapFeatures features ([
@@ -1918,11 +1976,11 @@ rec {
     aho_corasick."${deps.regex."0.1.80".aho_corasick}".default = true;
     memchr."${deps.regex."0.1.80".memchr}".default = true;
     regex = fold recursiveUpdate {} [
-      { "0.1.80".default = (f.regex."0.1.80".default or true); }
-      { "0.1.80".simd =
-        (f.regex."0.1.80".simd or false) ||
+      { "0.1.80"."simd" =
+        (f.regex."0.1.80"."simd" or false) ||
         (f.regex."0.1.80".simd-accel or false) ||
         (regex."0.1.80"."simd-accel" or false); }
+      { "0.1.80".default = (f.regex."0.1.80".default or true); }
     ];
     regex_syntax."${deps.regex."0.1.80".regex_syntax}".default = true;
     thread_local."${deps.regex."0.1.80".thread_local}".default = true;
@@ -1942,6 +2000,7 @@ rec {
   crates.regex_syntax."0.3.9" = deps: { features?(features_.regex_syntax."0.3.9" deps {}) }: buildRustCrate {
     crateName = "regex-syntax";
     version = "0.3.9";
+    description = "A regular expression parser.";
     authors = [ "The Rust Project Developers" ];
     sha256 = "1mzhphkbwppwd1zam2jkgjk550cqgf6506i87bw2yzrvcsraiw7m";
   };
@@ -1956,6 +2015,7 @@ rec {
   crates.rlua."0.9.7" = deps: { features?(features_.rlua."0.9.7" deps {}) }: buildRustCrate {
     crateName = "rlua";
     version = "0.9.7";
+    description = "High level bindings to Lua 5.3";
     authors = [ "kyren <catherine@chucklefish.org>" ];
     sha256 = "1671b5ga54aq49sqx69hvnjr732hf9jpqwswwxgpcqq8q05mfzgp";
     dependencies = mapFeatures features ([
@@ -1971,15 +2031,15 @@ rec {
     gcc."${deps.rlua."0.9.7".gcc}".default = true;
     libc."${deps.rlua."0.9.7".libc}".default = true;
     rlua = fold recursiveUpdate {} [
-      { "0.9.7".builtin-lua =
-        (f.rlua."0.9.7".builtin-lua or false) ||
+      { "0.9.7"."builtin-lua" =
+        (f.rlua."0.9.7"."builtin-lua" or false) ||
         (f.rlua."0.9.7".default or false) ||
         (rlua."0.9.7"."default" or false); }
-      { "0.9.7".default = (f.rlua."0.9.7".default or true); }
-      { "0.9.7".gcc =
-        (f.rlua."0.9.7".gcc or false) ||
+      { "0.9.7"."gcc" =
+        (f.rlua."0.9.7"."gcc" or false) ||
         (f.rlua."0.9.7".builtin-lua or false) ||
         (rlua."0.9.7"."builtin-lua" or false); }
+      { "0.9.7".default = (f.rlua."0.9.7".default or true); }
     ];
   }) [
     (features_.libc."${deps."rlua"."0.9.7"."libc"}" deps)
@@ -1993,6 +2053,7 @@ rec {
   crates.rustc_serialize."0.3.24" = deps: { features?(features_.rustc_serialize."0.3.24" deps {}) }: buildRustCrate {
     crateName = "rustc-serialize";
     version = "0.3.24";
+    description = "Generic serialization/deserialization support corresponding to the\n`derive(RustcEncodable, RustcDecodable)` mode in the compiler. Also includes\nsupport for hex, base64, and json encoding and decoding.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "0rfk6p66mqkd3g36l0ddlv2rvnp1mp3lrq5frq9zz5cbnz5pmmxn";
   };
@@ -2007,6 +2068,7 @@ rec {
   crates.rustc_version."0.1.7" = deps: { features?(features_.rustc_version."0.1.7" deps {}) }: buildRustCrate {
     crateName = "rustc_version";
     version = "0.1.7";
+    description = "A library for querying the version of a installed rustc compiler";
     authors = [ "Marvin Löbel <loebel.marvin@gmail.com>" ];
     sha256 = "0plm9pbyvcwfibd0kbhzil9xmr1bvqi8fgwlfw0x4vali8s6s99p";
     dependencies = mapFeatures features ([
@@ -2027,6 +2089,7 @@ rec {
   crates.rustwlc."0.7.0" = deps: { features?(features_.rustwlc."0.7.0" deps {}) }: buildRustCrate {
     crateName = "rustwlc";
     version = "0.7.0";
+    description = "wlc Wayland library bindings for Rust";
     authors = [ "Snirk Immington <snirk.immington@gmail.com>" "Timidger <apragmaticplace@gmail.com>" ];
     sha256 = "0gqi9pdw74al33ja25h33q68vnfklj3gpjgkiqqbr3gflgli5h1i";
     build = "build.rs";
@@ -2041,11 +2104,11 @@ rec {
     bitflags."${deps.rustwlc."0.7.0".bitflags}".default = true;
     libc."${deps.rustwlc."0.7.0".libc}".default = true;
     rustwlc = fold recursiveUpdate {} [
-      { "0.7.0".default = (f.rustwlc."0.7.0".default or true); }
-      { "0.7.0".wayland-sys =
-        (f.rustwlc."0.7.0".wayland-sys or false) ||
+      { "0.7.0"."wayland-sys" =
+        (f.rustwlc."0.7.0"."wayland-sys" or false) ||
         (f.rustwlc."0.7.0".wlc-wayland or false) ||
         (rustwlc."0.7.0"."wlc-wayland" or false); }
+      { "0.7.0".default = (f.rustwlc."0.7.0".default or true); }
     ];
     wayland_sys = fold recursiveUpdate {} [
       { "${deps.rustwlc."0.7.0".wayland_sys}"."server" = true; }
@@ -2064,6 +2127,7 @@ rec {
   crates.semver."0.1.20" = deps: { features?(features_.semver."0.1.20" deps {}) }: buildRustCrate {
     crateName = "semver";
     version = "0.1.20";
+    description = "Semantic version parsing and comparison.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "05cdig0071hls2k8lxbqmyqpl0zjmc53i2d43mwzps033b8njh4n";
   };
@@ -2078,6 +2142,7 @@ rec {
   crates.serde."0.9.15" = deps: { features?(features_.serde."0.9.15" deps {}) }: buildRustCrate {
     crateName = "serde";
     version = "0.9.15";
+    description = "A generic serialization/deserialization framework";
     authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" ];
     sha256 = "0rlflkc57kvy69hnhj4arfsj7ic4hpihxsb00zg5lkdxfj5qjx9b";
     dependencies = mapFeatures features ([
@@ -2086,29 +2151,29 @@ rec {
   };
   features_.serde."0.9.15" = deps: f: updateFeatures f (rec {
     serde = fold recursiveUpdate {} [
-      { "0.9.15".alloc =
-        (f.serde."0.9.15".alloc or false) ||
+      { "0.9.15"."alloc" =
+        (f.serde."0.9.15"."alloc" or false) ||
         (f.serde."0.9.15".collections or false) ||
         (serde."0.9.15"."collections" or false); }
-      { "0.9.15".default = (f.serde."0.9.15".default or true); }
-      { "0.9.15".serde_derive =
-        (f.serde."0.9.15".serde_derive or false) ||
+      { "0.9.15"."serde_derive" =
+        (f.serde."0.9.15"."serde_derive" or false) ||
         (f.serde."0.9.15".derive or false) ||
         (serde."0.9.15"."derive" or false) ||
         (f.serde."0.9.15".playground or false) ||
         (serde."0.9.15"."playground" or false); }
-      { "0.9.15".std =
-        (f.serde."0.9.15".std or false) ||
+      { "0.9.15"."std" =
+        (f.serde."0.9.15"."std" or false) ||
         (f.serde."0.9.15".default or false) ||
         (serde."0.9.15"."default" or false) ||
         (f.serde."0.9.15".unstable-testing or false) ||
         (serde."0.9.15"."unstable-testing" or false); }
-      { "0.9.15".unstable =
-        (f.serde."0.9.15".unstable or false) ||
+      { "0.9.15"."unstable" =
+        (f.serde."0.9.15"."unstable" or false) ||
         (f.serde."0.9.15".alloc or false) ||
         (serde."0.9.15"."alloc" or false) ||
         (f.serde."0.9.15".unstable-testing or false) ||
         (serde."0.9.15"."unstable-testing" or false); }
+      { "0.9.15".default = (f.serde."0.9.15".default or true); }
     ];
   }) [];
 
@@ -2119,6 +2184,7 @@ rec {
   crates.serde_json."0.9.10" = deps: { features?(features_.serde_json."0.9.10" deps {}) }: buildRustCrate {
     crateName = "serde_json";
     version = "0.9.10";
+    description = "A JSON serialization file format";
     authors = [ "Erick Tryzelaar <erick.tryzelaar@gmail.com>" ];
     sha256 = "0g6bxlfnvf2miicnsizyrxm686rfval6gbss1i2qcna8msfwc005";
     dependencies = mapFeatures features ([
@@ -2135,11 +2201,11 @@ rec {
     num_traits."${deps.serde_json."0.9.10".num_traits}".default = true;
     serde."${deps.serde_json."0.9.10".serde}".default = true;
     serde_json = fold recursiveUpdate {} [
-      { "0.9.10".default = (f.serde_json."0.9.10".default or true); }
-      { "0.9.10".linked-hash-map =
-        (f.serde_json."0.9.10".linked-hash-map or false) ||
+      { "0.9.10"."linked-hash-map" =
+        (f.serde_json."0.9.10"."linked-hash-map" or false) ||
         (f.serde_json."0.9.10".preserve_order or false) ||
         (serde_json."0.9.10"."preserve_order" or false); }
+      { "0.9.10".default = (f.serde_json."0.9.10".default or true); }
     ];
   }) [
     (features_.dtoa."${deps."serde_json"."0.9.10"."dtoa"}" deps)
@@ -2155,6 +2221,7 @@ rec {
   crates.siphasher."0.2.3" = deps: { features?(features_.siphasher."0.2.3" deps {}) }: buildRustCrate {
     crateName = "siphasher";
     version = "0.2.3";
+    description = "SipHash functions from rust-core < 1.13";
     authors = [ "Frank Denis <github@pureftpd.org>" ];
     sha256 = "1ganj1grxqnkvv4ds3vby039bm999jrr58nfq2x3kjhzkw2bnqkw";
   };
@@ -2169,6 +2236,7 @@ rec {
   crates.target_build_utils."0.3.1" = deps: { features?(features_.target_build_utils."0.3.1" deps {}) }: buildRustCrate {
     crateName = "target_build_utils";
     version = "0.3.1";
+    description = "DEPRECATED: Use Cargo environment variables `CARGO_CFG_TARGET_*`";
     authors = [ "Simonas Kazlauskas <target_build_utils@kazlauskas.me>" ];
     sha256 = "1b450nyxlbgicp2p45mhxiv6yv0z7s4iw01lsaqh3v7b4bm53flj";
     build = "build.rs";
@@ -2187,11 +2255,11 @@ rec {
     phf_codegen."${deps.target_build_utils."0.3.1".phf_codegen}".default = true;
     serde_json."${deps.target_build_utils."0.3.1".serde_json}".default = true;
     target_build_utils = fold recursiveUpdate {} [
-      { "0.3.1".default = (f.target_build_utils."0.3.1".default or true); }
-      { "0.3.1".serde_json =
-        (f.target_build_utils."0.3.1".serde_json or false) ||
+      { "0.3.1"."serde_json" =
+        (f.target_build_utils."0.3.1"."serde_json" or false) ||
         (f.target_build_utils."0.3.1".default or false) ||
         (target_build_utils."0.3.1"."default" or false); }
+      { "0.3.1".default = (f.target_build_utils."0.3.1".default or true); }
     ];
   }) [
     (features_.phf."${deps."target_build_utils"."0.3.1"."phf"}" deps)
@@ -2206,6 +2274,7 @@ rec {
   crates.thread_id."2.0.0" = deps: { features?(features_.thread_id."2.0.0" deps {}) }: buildRustCrate {
     crateName = "thread-id";
     version = "2.0.0";
+    description = "Get a unique thread ID";
     authors = [ "Ruud van Asseldonk <dev@veniogames.com>" ];
     sha256 = "06i3c8ckn97i5rp16civ2vpqbknlkx66dkrl070iw60nawi0kjc3";
     dependencies = mapFeatures features ([
@@ -2229,6 +2298,7 @@ rec {
   crates.thread_local."0.2.7" = deps: { features?(features_.thread_local."0.2.7" deps {}) }: buildRustCrate {
     crateName = "thread_local";
     version = "0.2.7";
+    description = "Per-object thread-local storage";
     authors = [ "Amanieu d'Antras <amanieu@gmail.com>" ];
     sha256 = "19p0zrs24rdwjvpi10jig5ms3sxj00pv8shkr9cpddri8cdghqp7";
     dependencies = mapFeatures features ([
@@ -2249,6 +2319,7 @@ rec {
   crates.token_store."0.1.2" = deps: { features?(features_.token_store."0.1.2" deps {}) }: buildRustCrate {
     crateName = "token_store";
     version = "0.1.2";
+    description = "A token-based store for arbitrary values";
     authors = [ "Victor Berger <victor.berger@m4x.org>" ];
     sha256 = "1v7acraqyh6iibg87pwkxm41v783sminxm5k9f4ndra7r0vq4zvq";
   };
@@ -2263,6 +2334,7 @@ rec {
   crates.unicode_width."0.1.5" = deps: { features?(features_.unicode_width."0.1.5" deps {}) }: buildRustCrate {
     crateName = "unicode-width";
     version = "0.1.5";
+    description = "Determine displayed width of `char` and `str` types\naccording to Unicode Standard Annex #11 rules.\n";
     authors = [ "kwantam <kwantam@gmail.com>" ];
     sha256 = "0886lc2aymwgy0lhavwn6s48ik3c61ykzzd3za6prgnw51j7bi4w";
     features = mkFeatures (features."unicode_width"."0.1.5" or {});
@@ -2278,6 +2350,7 @@ rec {
   crates.utf8_ranges."0.1.3" = deps: { features?(features_.utf8_ranges."0.1.3" deps {}) }: buildRustCrate {
     crateName = "utf8-ranges";
     version = "0.1.3";
+    description = "Convert ranges of Unicode codepoints to UTF-8 byte ranges.";
     authors = [ "Andrew Gallant <jamslam@gmail.com>" ];
     sha256 = "1cj548a91a93j8375p78qikaiam548xh84cb0ck8y119adbmsvbp";
   };
@@ -2292,6 +2365,7 @@ rec {
   crates.uuid."0.3.1" = deps: { features?(features_.uuid."0.3.1" deps {}) }: buildRustCrate {
     crateName = "uuid";
     version = "0.3.1";
+    description = "A library to generate and parse UUIDs.\n";
     authors = [ "The Rust Project Developers" ];
     sha256 = "16ak1c84dfkd8h33cvkxrkvc30k7b0bhrnza8ni2c0jsx85fpbip";
     dependencies = mapFeatures features ([
@@ -2304,15 +2378,15 @@ rec {
     rand."${deps.uuid."0.3.1".rand}".default = true;
     rustc_serialize."${deps.uuid."0.3.1".rustc_serialize}".default = true;
     uuid = fold recursiveUpdate {} [
-      { "0.3.1".default = (f.uuid."0.3.1".default or true); }
-      { "0.3.1".rand =
-        (f.uuid."0.3.1".rand or false) ||
+      { "0.3.1"."rand" =
+        (f.uuid."0.3.1"."rand" or false) ||
         (f.uuid."0.3.1".v4 or false) ||
         (uuid."0.3.1"."v4" or false); }
-      { "0.3.1".sha1 =
-        (f.uuid."0.3.1".sha1 or false) ||
+      { "0.3.1"."sha1" =
+        (f.uuid."0.3.1"."sha1" or false) ||
         (f.uuid."0.3.1".v5 or false) ||
         (uuid."0.3.1"."v5" or false); }
+      { "0.3.1".default = (f.uuid."0.3.1".default or true); }
     ];
   }) [
     (features_.rand."${deps."uuid"."0.3.1"."rand"}" deps)
@@ -2326,17 +2400,18 @@ rec {
   crates.void."1.0.2" = deps: { features?(features_.void."1.0.2" deps {}) }: buildRustCrate {
     crateName = "void";
     version = "1.0.2";
+    description = "The uninhabited void type for use in statically impossible cases.";
     authors = [ "Jonathan Reem <jonathan.reem@gmail.com>" ];
     sha256 = "0h1dm0dx8dhf56a83k68mijyxigqhizpskwxfdrs1drwv2cdclv3";
     features = mkFeatures (features."void"."1.0.2" or {});
   };
   features_.void."1.0.2" = deps: f: updateFeatures f (rec {
     void = fold recursiveUpdate {} [
-      { "1.0.2".default = (f.void."1.0.2".default or true); }
-      { "1.0.2".std =
-        (f.void."1.0.2".std or false) ||
+      { "1.0.2"."std" =
+        (f.void."1.0.2"."std" or false) ||
         (f.void."1.0.2".default or false) ||
         (void."1.0.2"."default" or false); }
+      { "1.0.2".default = (f.void."1.0.2".default or true); }
     ];
   }) [];
 
@@ -2347,6 +2422,7 @@ rec {
   crates.way_cooler."0.8.1" = deps: { features?(features_.way_cooler."0.8.1" deps {}) }: buildRustCrate {
     crateName = "way-cooler";
     version = "0.8.1";
+    description = "Customizeable Wayland compositor written in Rust";
     authors = [ "Snirk Immington <snirk.immington@gmail.com>" "Timidger <apragmaticplace@gmail.com>" ];
     sha256 = "01cp5z0qf522d7cvsr9gfp7f4hkphmp38hv70dsf9lvcnp6p1qkc";
     build = "build.rs";
@@ -2357,7 +2433,7 @@ rec {
       (crates."dbus"."${deps."way_cooler"."0.8.1"."dbus"}" deps)
       (crates."dbus_macros"."${deps."way_cooler"."0.8.1"."dbus_macros"}" deps)
       (crates."env_logger"."${deps."way_cooler"."0.8.1"."env_logger"}" deps)
-      (crates."gdk-pixbuf"."${deps."way_cooler"."0.8.1"."gdk-pixbuf"}" deps)
+      (crates."gdk_pixbuf"."${deps."way_cooler"."0.8.1"."gdk_pixbuf"}" deps)
       (crates."getopts"."${deps."way_cooler"."0.8.1"."getopts"}" deps)
       (crates."glib"."${deps."way_cooler"."0.8.1"."glib"}" deps)
       (crates."json_macro"."${deps."way_cooler"."0.8.1"."json_macro"}" deps)
@@ -2386,7 +2462,7 @@ rec {
     dbus."${deps.way_cooler."0.8.1".dbus}".default = true;
     dbus_macros."${deps.way_cooler."0.8.1".dbus_macros}".default = true;
     env_logger."${deps.way_cooler."0.8.1".env_logger}".default = true;
-    gdk-pixbuf."${deps.way_cooler."0.8.1".gdk-pixbuf}".default = true;
+    gdk_pixbuf."${deps.way_cooler."0.8.1".gdk_pixbuf}".default = true;
     getopts."${deps.way_cooler."0.8.1".getopts}".default = true;
     glib."${deps.way_cooler."0.8.1".glib}".default = true;
     json_macro."${deps.way_cooler."0.8.1".json_macro}".default = true;
@@ -2434,7 +2510,7 @@ rec {
     (features_.dbus."${deps."way_cooler"."0.8.1"."dbus"}" deps)
     (features_.dbus_macros."${deps."way_cooler"."0.8.1"."dbus_macros"}" deps)
     (features_.env_logger."${deps."way_cooler"."0.8.1"."env_logger"}" deps)
-    (features_.gdk-pixbuf."${deps."way_cooler"."0.8.1"."gdk-pixbuf"}" deps)
+    (features_.gdk_pixbuf."${deps."way_cooler"."0.8.1"."gdk_pixbuf"}" deps)
     (features_.getopts."${deps."way_cooler"."0.8.1"."getopts"}" deps)
     (features_.glib."${deps."way_cooler"."0.8.1"."glib"}" deps)
     (features_.json_macro."${deps."way_cooler"."0.8.1"."json_macro"}" deps)
@@ -2459,6 +2535,7 @@ rec {
   crates.wayland_scanner."0.12.5" = deps: { features?(features_.wayland_scanner."0.12.5" deps {}) }: buildRustCrate {
     crateName = "wayland-scanner";
     version = "0.12.5";
+    description = "Wayland Scanner for generating rust APIs from XML wayland protocol files. Intented for use with wayland-sys. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
     authors = [ "Victor Berger <victor.berger@m4x.org>" ];
     sha256 = "1s0fsc3pff0fxvzqsy8n018smwacih9ix8ww0yf969aa0vak15dz";
     dependencies = mapFeatures features ([
@@ -2479,6 +2556,7 @@ rec {
   crates.wayland_server."0.12.5" = deps: { features?(features_.wayland_server."0.12.5" deps {}) }: buildRustCrate {
     crateName = "wayland-server";
     version = "0.12.5";
+    description = "Bindings to the standard C implementation of the wayland protocol, server side.";
     authors = [ "Victor Berger <victor.berger@m4x.org>" ];
     sha256 = "17g0m9afcmi24ylirw4l8i70s5849x7m4b5nxk9k13s5pkza68ag";
     build = "build.rs";
@@ -2526,6 +2604,7 @@ rec {
   crates.wayland_sys."0.6.0" = deps: { features?(features_.wayland_sys."0.6.0" deps {}) }: buildRustCrate {
     crateName = "wayland-sys";
     version = "0.6.0";
+    description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
     authors = [ "Victor Berger <victor.berger@m4x.org>" ];
     sha256 = "0m6db0kld2d4xv4ai9kxlqrh362hwi0030b4zbss0sfha1hx5mfl";
     dependencies = mapFeatures features ([
@@ -2544,15 +2623,15 @@ rec {
     ];
     libc."${deps.wayland_sys."0.6.0".libc}".default = true;
     wayland_sys = fold recursiveUpdate {} [
-      { "0.6.0".default = (f.wayland_sys."0.6.0".default or true); }
-      { "0.6.0".lazy_static =
-        (f.wayland_sys."0.6.0".lazy_static or false) ||
+      { "0.6.0"."lazy_static" =
+        (f.wayland_sys."0.6.0"."lazy_static" or false) ||
         (f.wayland_sys."0.6.0".dlopen or false) ||
         (wayland_sys."0.6.0"."dlopen" or false); }
-      { "0.6.0".libc =
-        (f.wayland_sys."0.6.0".libc or false) ||
+      { "0.6.0"."libc" =
+        (f.wayland_sys."0.6.0"."libc" or false) ||
         (f.wayland_sys."0.6.0".server or false) ||
         (wayland_sys."0.6.0"."server" or false); }
+      { "0.6.0".default = (f.wayland_sys."0.6.0".default or true); }
     ];
   }) [
     (features_.dlib."${deps."wayland_sys"."0.6.0"."dlib"}" deps)
@@ -2566,6 +2645,7 @@ rec {
   crates.wayland_sys."0.9.10" = deps: { features?(features_.wayland_sys."0.9.10" deps {}) }: buildRustCrate {
     crateName = "wayland-sys";
     version = "0.9.10";
+    description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
     authors = [ "Victor Berger <victor.berger@m4x.org>" ];
     sha256 = "011q7lfii222whvif39asvryl1sf3rc1fxp8qs8gh84kr4mna0k8";
     dependencies = mapFeatures features ([
@@ -2586,15 +2666,15 @@ rec {
     lazy_static."${deps.wayland_sys."0.9.10".lazy_static}".default = true;
     libc."${deps.wayland_sys."0.9.10".libc}".default = true;
     wayland_sys = fold recursiveUpdate {} [
-      { "0.9.10".default = (f.wayland_sys."0.9.10".default or true); }
-      { "0.9.10".lazy_static =
-        (f.wayland_sys."0.9.10".lazy_static or false) ||
+      { "0.9.10"."lazy_static" =
+        (f.wayland_sys."0.9.10"."lazy_static" or false) ||
         (f.wayland_sys."0.9.10".dlopen or false) ||
         (wayland_sys."0.9.10"."dlopen" or false); }
-      { "0.9.10".libc =
-        (f.wayland_sys."0.9.10".libc or false) ||
+      { "0.9.10"."libc" =
+        (f.wayland_sys."0.9.10"."libc" or false) ||
         (f.wayland_sys."0.9.10".server or false) ||
         (wayland_sys."0.9.10"."server" or false); }
+      { "0.9.10".default = (f.wayland_sys."0.9.10".default or true); }
     ];
   }) [
     (features_.dlib."${deps."wayland_sys"."0.9.10"."dlib"}" deps)
@@ -2609,6 +2689,7 @@ rec {
   crates.wayland_sys."0.12.5" = deps: { features?(features_.wayland_sys."0.12.5" deps {}) }: buildRustCrate {
     crateName = "wayland-sys";
     version = "0.12.5";
+    description = "FFI bindings to the various libwayland-*.so libraries. You should only need this crate if you are working on custom wayland protocol extensions. Look at the crate wayland-client for usable bindings.";
     authors = [ "Victor Berger <victor.berger@m4x.org>" ];
     sha256 = "0mwk5vc7mibxka5w66vy2qj32b72d1srqvp36nr15xfl9lwf3dc4";
     dependencies = mapFeatures features ([
@@ -2629,15 +2710,15 @@ rec {
     lazy_static."${deps.wayland_sys."0.12.5".lazy_static}".default = true;
     libc."${deps.wayland_sys."0.12.5".libc}".default = true;
     wayland_sys = fold recursiveUpdate {} [
-      { "0.12.5".default = (f.wayland_sys."0.12.5".default or true); }
-      { "0.12.5".lazy_static =
-        (f.wayland_sys."0.12.5".lazy_static or false) ||
+      { "0.12.5"."lazy_static" =
+        (f.wayland_sys."0.12.5"."lazy_static" or false) ||
         (f.wayland_sys."0.12.5".dlopen or false) ||
         (wayland_sys."0.12.5"."dlopen" or false); }
-      { "0.12.5".libc =
-        (f.wayland_sys."0.12.5".libc or false) ||
+      { "0.12.5"."libc" =
+        (f.wayland_sys."0.12.5"."libc" or false) ||
         (f.wayland_sys."0.12.5".server or false) ||
         (wayland_sys."0.12.5"."server" or false); }
+      { "0.12.5".default = (f.wayland_sys."0.12.5".default or true); }
     ];
   }) [
     (features_.dlib."${deps."wayland_sys"."0.12.5"."dlib"}" deps)
@@ -2652,6 +2733,7 @@ rec {
   crates.winapi."0.2.8" = deps: { features?(features_.winapi."0.2.8" deps {}) }: buildRustCrate {
     crateName = "winapi";
     version = "0.2.8";
+    description = "Types and constants for WinAPI bindings. See README for list of crates providing function bindings.";
     authors = [ "Peter Atashian <retep998@gmail.com>" ];
     sha256 = "0a45b58ywf12vb7gvj6h3j264nydynmzyqz8d8rqxsj6icqv82as";
   };
@@ -2666,6 +2748,7 @@ rec {
   crates.winapi."0.3.6" = deps: { features?(features_.winapi."0.3.6" deps {}) }: buildRustCrate {
     crateName = "winapi";
     version = "0.3.6";
+    description = "Raw FFI bindings for all of Windows API.";
     authors = [ "Peter Atashian <retep998@gmail.com>" ];
     sha256 = "1d9jfp4cjd82sr1q4dgdlrkvm33zhhav9d7ihr0nivqbncr059m4";
     build = "build.rs";
@@ -2693,6 +2776,7 @@ rec {
   crates.winapi_build."0.1.1" = deps: { features?(features_.winapi_build."0.1.1" deps {}) }: buildRustCrate {
     crateName = "winapi-build";
     version = "0.1.1";
+    description = "Common code for build.rs in WinAPI -sys crates.";
     authors = [ "Peter Atashian <retep998@gmail.com>" ];
     sha256 = "1lxlpi87rkhxcwp2ykf1ldw3p108hwm24nywf3jfrvmff4rjhqga";
     libName = "build";
@@ -2708,6 +2792,7 @@ rec {
   crates.winapi_i686_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_i686_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
     crateName = "winapi-i686-pc-windows-gnu";
     version = "0.4.0";
+    description = "Import libraries for the i686-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead.";
     authors = [ "Peter Atashian <retep998@gmail.com>" ];
     sha256 = "05ihkij18r4gamjpxj4gra24514can762imjzlmak5wlzidplzrp";
     build = "build.rs";
@@ -2723,6 +2808,7 @@ rec {
   crates.winapi_x86_64_pc_windows_gnu."0.4.0" = deps: { features?(features_.winapi_x86_64_pc_windows_gnu."0.4.0" deps {}) }: buildRustCrate {
     crateName = "winapi-x86_64-pc-windows-gnu";
     version = "0.4.0";
+    description = "Import libraries for the x86_64-pc-windows-gnu target. Please don't use this crate directly, depend on winapi instead.";
     authors = [ "Peter Atashian <retep998@gmail.com>" ];
     sha256 = "0n1ylmlsb8yg1v583i4xy0qmqg42275flvbc51hdqjjfjcl9vlbj";
     build = "build.rs";
@@ -2738,6 +2824,7 @@ rec {
   crates.xcb."0.8.2" = deps: { features?(features_.xcb."0.8.2" deps {}) }: buildRustCrate {
     crateName = "xcb";
     version = "0.8.2";
+    description = "Rust bindings and wrappers for XCB";
     authors = [ "Remi Thebault <remi.thebault@gmail.com>" ];
     sha256 = "06l8jms57wvz01vx82a3cwak9b9qwdkadvpmkk1zimy2qg7i7dkl";
     build = "build.rs";
@@ -2755,41 +2842,40 @@ rec {
     libc."${deps.xcb."0.8.2".libc}".default = true;
     log."${deps.xcb."0.8.2".log}".default = true;
     xcb = fold recursiveUpdate {} [
-      { "0.8.2".composite =
-        (f.xcb."0.8.2".composite or false) ||
+      { "0.8.2"."composite" =
+        (f.xcb."0.8.2"."composite" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".damage =
-        (f.xcb."0.8.2".damage or false) ||
+      { "0.8.2"."damage" =
+        (f.xcb."0.8.2"."damage" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".default = (f.xcb."0.8.2".default or true); }
-      { "0.8.2".dpms =
-        (f.xcb."0.8.2".dpms or false) ||
+      { "0.8.2"."dpms" =
+        (f.xcb."0.8.2"."dpms" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".dri2 =
-        (f.xcb."0.8.2".dri2 or false) ||
+      { "0.8.2"."dri2" =
+        (f.xcb."0.8.2"."dri2" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".dri3 =
-        (f.xcb."0.8.2".dri3 or false) ||
+      { "0.8.2"."dri3" =
+        (f.xcb."0.8.2"."dri3" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".glx =
-        (f.xcb."0.8.2".glx or false) ||
+      { "0.8.2"."glx" =
+        (f.xcb."0.8.2"."glx" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".randr =
-        (f.xcb."0.8.2".randr or false) ||
+      { "0.8.2"."randr" =
+        (f.xcb."0.8.2"."randr" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".record =
-        (f.xcb."0.8.2".record or false) ||
+      { "0.8.2"."record" =
+        (f.xcb."0.8.2"."record" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".render =
-        (f.xcb."0.8.2".render or false) ||
+      { "0.8.2"."render" =
+        (f.xcb."0.8.2"."render" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false) ||
         (f.xcb."0.8.2".present or false) ||
@@ -2798,44 +2884,44 @@ rec {
         (xcb."0.8.2"."randr" or false) ||
         (f.xcb."0.8.2".xfixes or false) ||
         (xcb."0.8.2"."xfixes" or false); }
-      { "0.8.2".res =
-        (f.xcb."0.8.2".res or false) ||
+      { "0.8.2"."res" =
+        (f.xcb."0.8.2"."res" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".screensaver =
-        (f.xcb."0.8.2".screensaver or false) ||
+      { "0.8.2"."screensaver" =
+        (f.xcb."0.8.2"."screensaver" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".shape =
-        (f.xcb."0.8.2".shape or false) ||
+      { "0.8.2"."shape" =
+        (f.xcb."0.8.2"."shape" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false) ||
         (f.xcb."0.8.2".xfixes or false) ||
         (xcb."0.8.2"."xfixes" or false); }
-      { "0.8.2".shm =
-        (f.xcb."0.8.2".shm or false) ||
+      { "0.8.2"."shm" =
+        (f.xcb."0.8.2"."shm" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false) ||
         (f.xcb."0.8.2".xv or false) ||
         (xcb."0.8.2"."xv" or false); }
-      { "0.8.2".sync =
-        (f.xcb."0.8.2".sync or false) ||
+      { "0.8.2"."sync" =
+        (f.xcb."0.8.2"."sync" or false) ||
         (f.xcb."0.8.2".present or false) ||
         (xcb."0.8.2"."present" or false); }
-      { "0.8.2".thread =
-        (f.xcb."0.8.2".thread or false) ||
+      { "0.8.2"."thread" =
+        (f.xcb."0.8.2"."thread" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".xevie =
-        (f.xcb."0.8.2".xevie or false) ||
+      { "0.8.2"."xevie" =
+        (f.xcb."0.8.2"."xevie" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".xf86dri =
-        (f.xcb."0.8.2".xf86dri or false) ||
+      { "0.8.2"."xf86dri" =
+        (f.xcb."0.8.2"."xf86dri" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".xfixes =
-        (f.xcb."0.8.2".xfixes or false) ||
+      { "0.8.2"."xfixes" =
+        (f.xcb."0.8.2"."xfixes" or false) ||
         (f.xcb."0.8.2".composite or false) ||
         (xcb."0.8.2"."composite" or false) ||
         (f.xcb."0.8.2".damage or false) ||
@@ -2846,40 +2932,41 @@ rec {
         (xcb."0.8.2"."present" or false) ||
         (f.xcb."0.8.2".xinput or false) ||
         (xcb."0.8.2"."xinput" or false); }
-      { "0.8.2".xinerama =
-        (f.xcb."0.8.2".xinerama or false) ||
+      { "0.8.2"."xinerama" =
+        (f.xcb."0.8.2"."xinerama" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".xkb =
-        (f.xcb."0.8.2".xkb or false) ||
+      { "0.8.2"."xkb" =
+        (f.xcb."0.8.2"."xkb" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".xlib_xcb =
-        (f.xcb."0.8.2".xlib_xcb or false) ||
+      { "0.8.2"."xlib_xcb" =
+        (f.xcb."0.8.2"."xlib_xcb" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".xprint =
-        (f.xcb."0.8.2".xprint or false) ||
+      { "0.8.2"."xprint" =
+        (f.xcb."0.8.2"."xprint" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".xselinux =
-        (f.xcb."0.8.2".xselinux or false) ||
+      { "0.8.2"."xselinux" =
+        (f.xcb."0.8.2"."xselinux" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".xtest =
-        (f.xcb."0.8.2".xtest or false) ||
+      { "0.8.2"."xtest" =
+        (f.xcb."0.8.2"."xtest" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
-      { "0.8.2".xv =
-        (f.xcb."0.8.2".xv or false) ||
+      { "0.8.2"."xv" =
+        (f.xcb."0.8.2"."xv" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false) ||
         (f.xcb."0.8.2".xvmc or false) ||
         (xcb."0.8.2"."xvmc" or false); }
-      { "0.8.2".xvmc =
-        (f.xcb."0.8.2".xvmc or false) ||
+      { "0.8.2"."xvmc" =
+        (f.xcb."0.8.2"."xvmc" or false) ||
         (f.xcb."0.8.2".debug_all or false) ||
         (xcb."0.8.2"."debug_all" or false); }
+      { "0.8.2".default = (f.xcb."0.8.2".default or true); }
     ];
   }) [
     (features_.libc."${deps."xcb"."0.8.2"."libc"}" deps)
@@ -2894,6 +2981,7 @@ rec {
   crates.xml_rs."0.7.0" = deps: { features?(features_.xml_rs."0.7.0" deps {}) }: buildRustCrate {
     crateName = "xml-rs";
     version = "0.7.0";
+    description = "An XML library in pure Rust";
     authors = [ "Vladimir Matveev <vladimir.matweev@gmail.com>" ];
     sha256 = "12rynhqjgkg2hzy9x1d1232p9d9jm40bc3by5yzjv8gx089mflyb";
     libPath = "src/lib.rs";

From 6d6e2181d66c48a4cbb6ed49d74459308df3854c Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Thu, 25 Jul 2019 09:27:43 +0000
Subject: [PATCH 42/53] gflags: update pname

---
 pkgs/development/libraries/gflags/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gflags/default.nix b/pkgs/development/libraries/gflags/default.nix
index fefc3a8b4b8..2e818ea94ea 100644
--- a/pkgs/development/libraries/gflags/default.nix
+++ b/pkgs/development/libraries/gflags/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  name = "google-gflags-${version}";
+  pname = "gflags";
   version = "2.2.2";
 
   src = fetchFromGitHub {

From 2c666131033129dfd6503eb162d3345e10d948fc Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 25 Jul 2019 23:19:52 +0200
Subject: [PATCH 43/53] libva: 2.4.1 -> 2.5.0

---
 pkgs/development/libraries/libva/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 1c008130f65..7aba75a1d23 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -6,14 +6,14 @@
 
 stdenv.mkDerivation rec {
   name = "libva-${lib.optionalString minimal "minimal-"}${version}";
-  version = "2.4.1";
+  version = "2.5.0";
 
   # update libva-utils and vaapiIntel as well
   src = fetchFromGitHub {
     owner  = "01org";
     repo   = "libva";
     rev    = version;
-    sha256 = "06kqff05jhd87yi53gyc2qivgg4sbf19qyznm9s4dyz92k04cl5c";
+    sha256 = "0pys6blkh8ayxmxgfh7qrjzzcrzzn14z5d8q4a34ffqk90b6r93z";
   };
 
   outputs = [ "dev" "out" ];

From d4ffb8d4ec688488656ddfd917e2969c5116d119 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 25 Jul 2019 23:25:42 +0200
Subject: [PATCH 44/53] mesa: 19.1.1 -> 19.1.3

---
 pkgs/development/libraries/mesa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index 2c5e4a8e034..7b1b5a3cfa9 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -27,7 +27,7 @@
 with stdenv.lib;
 
 let
-  version = "19.1.1";
+  version = "19.1.3";
   branch  = head (splitString "." version);
 in
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    sha256 = "10amy5sdmpjbskr3xazgk0jyli8xpgi0y1nsmjr76hx8nhb4n4bj";
+    sha256 = "1q5p4mw7zrklwx1is09knnb762zzk33xwhwp99fw25ax4ar60m44";
   };
 
   prePatch = "patchShebangs .";

From 299e9345a854011ba17246b586645cead4d93bac Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 26 Jul 2019 18:53:12 -0500
Subject: [PATCH 45/53] Revert "qtbase: Fix paths returned by qmake -query"

---
 pkgs/development/libraries/qt-5/modules/qtbase.nix | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index a1c3bea866e..8506a80ddf3 100644
--- a/pkgs/development/libraries/qt-5/modules/qtbase.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix
@@ -171,7 +171,7 @@ stdenv.mkDerivation {
     NIX_OUTPUT_BIN = $bin
     NIX_OUTPUT_DEV = $dev
     NIX_OUTPUT_OUT = $out
-    NIX_OUTPUT_DOC = $out/$qtDocPrefix
+    NIX_OUTPUT_DOC = $dev/$qtDocPrefix
     NIX_OUTPUT_QML = $bin/$qtQmlPrefix
     NIX_OUTPUT_PLUGIN = $bin/$qtPluginPrefix
     EOF
@@ -387,18 +387,6 @@ stdenv.mkDerivation {
       moveToOutput bin "$dev"
     ''
 
-    # Fix paths returned by qmake -query
-    + ''
-      cat > $dev/bin/qt.conf <<EOF
-        [Paths]
-        Prefix = $out
-        Headers = $dev/include
-        Plugins = $bin/$qtPluginPrefix
-        Documentation = $out/$qtDocPrefix
-        HostBinaries = $dev/bin
-      EOF
-    ''
-
     + (
         # fixup .pc file (where to find 'moc' etc.)
         ''

From d0b50b88354eb636994f34be266d92d05e5ade76 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 25 Jul 2019 23:20:17 +0000
Subject: [PATCH 46/53] vaapiVdpau: fixup for libva-2.5.0

---
 .../libraries/vaapi-vdpau/default.nix         | 31 ++++++++++---------
 .../libraries/vaapi-vdpau/glext85.patch       | 20 ------------
 2 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/development/libraries/vaapi-vdpau/glext85.patch

diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix
index 07ca9d2e62e..f31f7e430e0 100644
--- a/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/pkgs/development/libraries/vaapi-vdpau/default.nix
@@ -1,10 +1,5 @@
-{ stdenv, fetchurl, libvdpau, libGLU_combined, libva, pkgconfig }:
-let
-  libvdpau08patch = (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch?revision=1.1";
-                                name = "libva-vdpau-driver-0.7.4-libvdpau-0.8.patch";
-                                sha256 = "1n2cys59wyv8ylx9i5m3s6856mgx24hzcp45w1ahdfbzdv9wrfbl";
-                              });
-in
+{ stdenv, fetchurl, fetchpatch, libvdpau, libGLU_combined, libva, pkgconfig }:
+
 stdenv.mkDerivation rec {
   name = "libva-vdpau-driver-0.7.4";
   
@@ -13,23 +8,31 @@ stdenv.mkDerivation rec {
     sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m";
   };
 
-  patches = [ ./glext85.patch
-              (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch?revision=1.1";
-                          name = "libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch";
-                          sha256 = "166svcav6axkrlb3i4rbf6dkwjnqdf69xw339az1f5yabj72pqqs";
-                        }) ];
+  patches = [
+    (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-glext-85.patch";
+                  sha256 = "0f0v7cl7kna3jcfnxw48b9mfl0hpacw72df9vym96sa2206vqlb0"; })
+    (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-drop-h264-api.patch";
+                  sha256 = "0q5w83jbf4qqmhwf54h906pzxgvhqv7g2vrkw7jzgnrxhhj9sj60"; })
+    (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/libva-vdpau-driver-0.7.4-fix_type.patch";
+                  sha256 = "0s5dk6aa4sm0iyicnf2fwfsrqbvr58nbp77mhjg5bvwlar7znqv7"; })
+    (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/sigfpe-crash.patch";
+                  sha256 = "15snqf60ib0xb3cnav5b2r55qv8lv2fa4p6jwxajh8wbvqpw0ibz"; })
+    (fetchpatch { url = "https://src.fedoraproject.org/rpms/libva-vdpau-driver/raw/0ad71107e28a60ea453ac70e895cf64342bd58d0/f/implement-vaquerysurfaceattributes.patch";
+                  sha256 = "1dapx3bqqblw6l2iqqw1yff6qifam8q4m2rq343kwb3dqhy2ymy5"; })
+    (fetchpatch { url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-include-linux-videodev2.h.patch";
+                  sha256 = "1m4is6lk580mppsx2mvdv1xifj6gvx724si4qynsm9qrdfdc9fby"; })
+  ];
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libvdpau libGLU_combined libva ];
 
   preConfigure = ''
-    patch -p0 < ${libvdpau08patch}  # use -p0 instead of -p1
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';
 
 
   meta = {
-    homepage = https://cgit.freedesktop.org/vaapi/vdpau-driver/;
+    homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver";
     license = stdenv.lib.licenses.gpl2Plus;
     description = "VDPAU driver for the VAAPI library";
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/development/libraries/vaapi-vdpau/glext85.patch b/pkgs/development/libraries/vaapi-vdpau/glext85.patch
deleted file mode 100644
index 073b8cf1190..00000000000
--- a/pkgs/development/libraries/vaapi-vdpau/glext85.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-http://www.mail-archive.com/libva@lists.freedesktop.org/msg01457.html
-
-diff --git a/src/utils_glx.h b/src/utils_glx.h
-index 19d03e4..f270fba 100644
---- a/src/utils_glx.h
-+++ b/src/utils_glx.h
-@@ -42,6 +42,13 @@ typedef void (*PFNGLVDPAUMAPSURFACESNVPROC)(GLsizei numSurfaces, const GLvdpauSu
- typedef void (*PFNGLVDPAUUNMAPSURFACESNVPROC)(GLsizei numSurface, const GLvdpauSurfaceNV *surfaces);
- #endif
- 
-+#if GL_GLEXT_VERSION >= 85
-+/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
-+   block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
-+   Redefine the type here as an interim solution */
-+typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
-+#endif
-+
- /* GLX_EXT_texture_from_pixmap */
- #if GLX_GLXEXT_VERSION < 18
- typedef void (*PFNGLXBINDTEXIMAGEEXTPROC)(Display *, GLXDrawable, int, const int *);

From e484667ec2993859d74b635f6859944e6debba83 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Fri, 26 Jul 2019 20:32:52 -0400
Subject: [PATCH 47/53] vaapiVdpau: cleanup expression

---
 .../libraries/vaapi-vdpau/default.nix            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix
index f31f7e430e0..e3fd7ad57e0 100644
--- a/pkgs/development/libraries/vaapi-vdpau/default.nix
+++ b/pkgs/development/libraries/vaapi-vdpau/default.nix
@@ -1,10 +1,11 @@
 { stdenv, fetchurl, fetchpatch, libvdpau, libGLU_combined, libva, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "libva-vdpau-driver-0.7.4";
-  
+  pname = "libva-vdpau-driver";
+  version = "0.7.4";
+
   src = fetchurl {
-    url = "https://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${name}.tar.bz2";
+    url = "https://www.freedesktop.org/software/vaapi/releases/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "1fcvgshzyc50yb8qqm6v6wn23ghimay23ci0p8sm8gxcy211jp0m";
   };
 
@@ -26,15 +27,14 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libvdpau libGLU_combined libva ];
 
-  preConfigure = ''
+  postPatch = ''
     sed -i -e "s,LIBVA_DRIVERS_PATH=.*,LIBVA_DRIVERS_PATH=$out/lib/dri," configure
   '';
 
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://cgit.freedesktop.org/vaapi/vdpau-driver";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     description = "VDPAU driver for the VAAPI library";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }

From fae343857244a7985c567e001d67b5dc5caf9533 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 2 Jul 2019 23:36:09 +0200
Subject: [PATCH 48/53] python.pkgs.numpy: don't exclude f2py test anymore

It is on PATH, and the tests pass.
---
 pkgs/development/python-modules/numpy/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index a02e7ee4c5f..a66694dc477 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -60,10 +60,9 @@ in buildPythonPackage rec {
     inherit blasImplementation cfg;
   };
 
-  # Disable two tests
-  # - test_f2py: f2py isn't yet on path.
+  # Disable test
   # - test_large_file_support: takes a long time and can cause the machine to run out of disk space
-  NOSE_EXCLUDE="test_f2py,test_large_file_support";
+  NOSE_EXCLUDE="test_large_file_support";
 
   meta = {
     description = "Scientific tools for Python";

From 55d82d54307e9c30ef34342e68ef615e4350b0a0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 27 Jul 2019 11:34:47 +0200
Subject: [PATCH 49/53] python: numpy: 1.16.4 -> 1.17.0

---
 pkgs/development/python-modules/numpy/default.nix |  4 ++--
 pkgs/top-level/python-packages.nix                | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix
index a66694dc477..10a1df8876c 100644
--- a/pkgs/development/python-modules/numpy/default.nix
+++ b/pkgs/development/python-modules/numpy/default.nix
@@ -16,12 +16,12 @@ let
   };
 in buildPythonPackage rec {
   pname = "numpy";
-  version = "1.16.4";
+  version = "1.17.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "7242be12a58fec245ee9734e625964b97cf7e3f2f7d016603f9e56660ce479c7";
+    sha256 = "951fefe2fb73f84c620bec4e001e80a80ddaa1b84dce244ded7f1e0cbe0ed34a";
   };
 
   nativeBuildInputs = [ gfortran pytest ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8796bde83b8..d34aae04529 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3840,9 +3840,18 @@ in {
 
   Nuitka = callPackage ../development/python-modules/nuitka { };
 
-  numpy = callPackage ../development/python-modules/numpy {
-    blas = pkgs.openblasCompat;
-  };
+  numpy = let
+    numpy_ = callPackage ../development/python-modules/numpy {
+      blas = pkgs.openblasCompat;
+    };
+    numpy_2 = numpy_.overridePythonAttrs(oldAttrs: rec {
+      version = "1.16.4";
+      src = oldAttrs.src.override {
+        inherit version;
+        sha256 = "1ivrwh66cmly7xh1dl7pybizfz5rcicn4kkkx5g29v4gll9bwhkj";
+      };
+    });
+  in if pythonOlder "3.5" then numpy_2 else numpy_;
 
   numpydoc = callPackage ../development/python-modules/numpydoc { };
 

From d09a85de5e936aae541fb30da665218d051865be Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 27 Jul 2019 12:03:02 +0200
Subject: [PATCH 50/53] python: statsmodels: 0.10.0 -> 0.10.1

---
 pkgs/development/python-modules/statsmodels/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/statsmodels/default.nix b/pkgs/development/python-modules/statsmodels/default.nix
index 25019155905..46daaa21a99 100644
--- a/pkgs/development/python-modules/statsmodels/default.nix
+++ b/pkgs/development/python-modules/statsmodels/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "statsmodels";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1fhsq3bz5ya54ipa0cb8qgfj7gfgxprv4briig0ly4r11rj23wv5";
+    sha256 = "320659a80f916c2edf9dfbe83512d9004bb562b72eedb7d9374562038697fa10";
   };
 
   checkInputs = with self; [ nose ];

From 66ce9ba14b074fc33161e67217569ca1cf2aae2c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 27 Jul 2019 12:19:54 +0200
Subject: [PATCH 51/53] python: Cython: 0.29.12 -> 0.29.13

---
 pkgs/development/python-modules/Cython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 13eb58baa0a..b88c3c69b5d 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -25,11 +25,11 @@ let
 
 in buildPythonPackage rec {
   pname = "Cython";
-  version = "0.29.12";
+  version = "0.29.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "20da832a5e9a8e93d1e1eb64650258956723940968eb585506531719b55b804f";
+    sha256 = "c29d069a4a30f472482343c866f7486731ad638ef9af92bfe5fca9c7323d638e";
   };
 
   nativeBuildInputs = [

From 360e687df95edb120ca4090acfe83a9518102953 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@protonmail.ch>
Date: Sat, 27 Jul 2019 19:57:20 -0400
Subject: [PATCH 52/53] hackage-packages.nix: gdk_pixbuf -> gdk-pixbuf

Temporary manual edit to fix eval on staging.
---
 .../haskell-modules/hackage-packages.nix       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index c7443a42e5b..1bfeac57840 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -92339,7 +92339,7 @@ self: {
      }) {inherit (pkgs) gtk3;};
 
   "gi-gdkpixbuf" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
@@ -92352,13 +92352,13 @@ self: {
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gdk_pixbuf ];
+       libraryPkgconfigDepends = [ gdk-pixbuf ];
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
-     }) {inherit (pkgs) gdk_pixbuf;};
+     }) {inherit (pkgs) gdk-pixbuf;};
 
   "gi-gdkpixbuf_2_0_22" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk-pixbuf
      , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
@@ -92373,11 +92373,11 @@ self: {
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
          haskell-gi-base haskell-gi-overloading text transformers
        ];
-       libraryPkgconfigDepends = [ gdk_pixbuf ];
+       libraryPkgconfigDepends = [ gdk-pixbuf ];
        description = "GdkPixbuf bindings";
        license = stdenv.lib.licenses.lgpl21;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) gdk_pixbuf;};
+     }) {inherit (pkgs) gdk-pixbuf;};
 
   "gi-gdkx11" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
@@ -182921,7 +182921,7 @@ self: {
 
   "poppler" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, cairo, containers
-     , gdk_pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango
+     , gdk-pixbuf, glib, gtk, gtk2, gtk2hs-buildtools, mtl, pango
      , poppler
      }:
      mkDerivation {
@@ -182933,13 +182933,13 @@ self: {
        libraryHaskellDepends = [
          array base bytestring cairo containers glib gtk mtl
        ];
-       libraryPkgconfigDepends = [ gdk_pixbuf gtk2 pango poppler ];
+       libraryPkgconfigDepends = [ gdk-pixbuf gtk2 pango poppler ];
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
        broken = true;
-     }) {inherit (pkgs) gdk_pixbuf; inherit (pkgs) gtk2; 
+     }) {inherit (pkgs) gdk-pixbuf; inherit (pkgs) gtk2; 
          inherit (pkgs) pango; inherit (pkgs) poppler;};
 
   "populate-setup-exe-cache" = callPackage

From 14070d1fdc55ffae1f1265b8e3c2d348924da9cf Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sat, 27 Jul 2019 21:00:53 +0200
Subject: [PATCH 53/53] libuv: 1.30.0 -> 1.30.1

---
 pkgs/development/libraries/libuv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix
index ade3f5796d5..07f99a058d8 100644
--- a/pkgs/development/libraries/libuv/default.nix
+++ b/pkgs/development/libraries/libuv/default.nix
@@ -1,14 +1,14 @@
 { stdenv, lib, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, ApplicationServices, CoreServices }:
 
 stdenv.mkDerivation rec {
-  version = "1.30.0";
+  version = "1.30.1";
   pname = "libuv";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "0j26nh799962l1gn3v3sw1x6fnia2dx5irhl33nc77gy2gzayv07";
+    sha256 = "16l207g9qwckxn0vnbnwiybhw6083imdwyfd6ipfsl44b1m8jmf7";
   };
 
   postPatch = let