From 135a841d9124f0c27750ee909d02a84bff23b44e Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 14 Aug 2017 12:56:36 -0400
Subject: [PATCH 01/75] curl: 7.55.0 -> 7.55.1

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

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 4d292abc9acf..4ec79af66516 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -21,11 +21,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.55.0";
+  name = "curl-7.55.1";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "1cg5h0klsx887qd4wpkk5bpkbw1bfc4q7adsrai71zhmdzn6j7dg";
+    sha256 = "1yvcn7jbh99gsqhc040nky0h15a1cfh8yic6k0a1zhdhscpakcg5";
   };
 
   outputs = [ "bin" "dev" "out" "man" "devdoc" ];
@@ -72,10 +72,6 @@ stdenv.mkDerivation rec {
   CXXCPP = "g++ -E";
 
   postInstall = ''
-    pushd docs/libcurl
-    make install
-    popd
-
     moveToOutput bin/curl-config "$dev"
     sed '/^dependency_libs/s|${libssh2.dev}|${libssh2.out}|' -i "$out"/lib/*.la
   '' + stdenv.lib.optionalString gnutlsSupport ''

From fbab1d485b60f30af7f2403085c269dfa24b9984 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 15 Aug 2017 11:30:45 -0400
Subject: [PATCH 02/75] stdenvs: Distinguish between `extraBuildInputs` and
 `extraNativeBuildInputs`

This version continues to use bash + stdenv/setup for the default
inputs.
---
 pkgs/stdenv/darwin/default.nix          | 15 +++++++++++----
 pkgs/stdenv/generic/builder.sh          |  1 +
 pkgs/stdenv/generic/default.nix         | 18 +++++++++++++-----
 pkgs/stdenv/generic/make-derivation.nix | 16 ++++++++++++----
 pkgs/stdenv/linux/default.nix           | 10 +++++-----
 pkgs/stdenv/native/default.nix          |  8 ++++----
 6 files changed, 46 insertions(+), 22 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 74dcf2f009b3..2eeab14b1c79 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -59,11 +59,12 @@ in rec {
   stageFun = step: last: {shell             ? "${bootstrapTools}/bin/bash",
                           overrides         ? (self: super: {}),
                           extraPreHook      ? "",
+                          extraNativeBuildInputs,
                           extraBuildInputs,
                           allowedRequisites ? null}:
     let
       thisStdenv = import ../generic {
-        inherit config shell extraBuildInputs;
+        inherit config shell extraNativeBuildInputs extraBuildInputs;
         allowedRequisites = if allowedRequisites == null then null else allowedRequisites ++ [
           thisStdenv.cc.expand-response-params
         ];
@@ -162,6 +163,7 @@ in rec {
 
     };
 
+    extraNativeBuildInputs = [];
     extraBuildInputs = [];
   };
 
@@ -169,6 +171,7 @@ in rec {
 
   stage1 = prevStage: with prevStage; stageFun 1 prevStage {
     extraPreHook = "export NIX_CFLAGS_COMPILE+=\" -F${bootstrapTools}/Library/Frameworks\"";
+    extraNativeBuildInputs = [];
     extraBuildInputs = [ pkgs.libcxx ];
 
     allowedRequisites =
@@ -195,7 +198,8 @@ in rec {
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
 
-    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx ];
+    extraNativeBuildInputs = [ pkgs.xz ];
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
     allowedRequisites =
       [ bootstrapTools ] ++
@@ -226,7 +230,8 @@ in rec {
     # enables patchShebangs above. Unfortunately, patchShebangs ignores our $SHELL setting
     # and instead goes by $PATH, which happens to contain bootstrapTools. So it goes and
     # patches our shebangs back to point at bootstrapTools. This makes sure bash comes first.
-    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
+    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
     extraPreHook = ''
       export PATH=${pkgs.bash}/bin:$PATH
@@ -260,7 +265,8 @@ in rec {
 
   stage4 = prevStage: with prevStage; stageFun 4 prevStage {
     shell = "${pkgs.bash}/bin/bash";
-    extraBuildInputs = with pkgs; [ xz darwin.CF libcxx pkgs.bash ];
+    extraNativeBuildInputs = with pkgs; [ xz pkgs.bash ];
+    extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
     extraPreHook = ''
       export PATH_LOCALE=${pkgs.darwin.locale}/share/locale
     '';
@@ -321,6 +327,7 @@ in rec {
       libc = pkgs.darwin.Libsystem;
     };
 
+    extraNativeBuildInputs = [];
     extraBuildInputs = with pkgs; [ darwin.CF libcxx ];
 
     extraAttrs = {
diff --git a/pkgs/stdenv/generic/builder.sh b/pkgs/stdenv/generic/builder.sh
index 42e1a029e584..79bf21ab4730 100644
--- a/pkgs/stdenv/generic/builder.sh
+++ b/pkgs/stdenv/generic/builder.sh
@@ -9,6 +9,7 @@ mkdir $out
 echo "export SHELL=$shell" > $out/setup
 echo "initialPath=\"$initialPath\"" >> $out/setup
 echo "defaultNativeBuildInputs=\"$defaultNativeBuildInputs\"" >> $out/setup
+echo "defaultBuildInputs=\"$defaultBuildInputs\"" >> $out/setup
 echo "$preHook" >> $out/setup
 cat "$setup" >> $out/setup
 
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index a5d3c5a8ff5c..17bf1f8b428c 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -9,6 +9,7 @@ let lib = import ../../../lib; in lib.makeOverridable (
 
 , setupScript ? ./setup.sh
 
+, extraNativeBuildInputs ? []
 , extraBuildInputs ? []
 , __stdenvImpureHostDeps ? []
 , __extraImpureHostDeps ? []
@@ -41,7 +42,7 @@ let lib = import ../../../lib; in lib.makeOverridable (
 }:
 
 let
-  defaultNativeBuildInputs = extraBuildInputs ++
+  defaultNativeBuildInputs = extraNativeBuildInputs ++
     [ ../../build-support/setup-hooks/move-docs.sh
       ../../build-support/setup-hooks/compress-man-pages.sh
       ../../build-support/setup-hooks/strip.sh
@@ -58,11 +59,16 @@ let
       cc
     ];
 
+  defaultBuildInputs = extraBuildInputs;
+
   # The stdenv that we are producing.
   stdenv =
     derivation (
-    (if isNull allowedRequisites then {} else { allowedRequisites = allowedRequisites ++ defaultNativeBuildInputs; }) //
-    {
+    lib.optionalAttrs (allowedRequisites != null) {
+      allowedRequisites = allowedRequisites
+        ++ defaultNativeBuildInputs ++ defaultBuildInputs;
+    }
+    // {
       inherit name;
 
       # Nix itself uses the `system` field of a derivation to decide where to
@@ -75,7 +81,8 @@ let
 
       setup = setupScript;
 
-      inherit preHook initialPath shell defaultNativeBuildInputs;
+      inherit preHook initialPath shell
+        defaultNativeBuildInputs defaultBuildInputs;
     }
     // lib.optionalAttrs buildPlatform.isDarwin {
       __sandboxProfile = stdenvSandboxProfile;
@@ -91,7 +98,8 @@ let
 
       inherit buildPlatform hostPlatform targetPlatform;
 
-      inherit extraBuildInputs __extraImpureHostDeps extraSandboxProfile;
+      inherit extraNativeBuildInputs extraBuildInputs
+        __extraImpureHostDeps extraSandboxProfile;
 
       # Utility flags to test the type of platform.
       inherit (hostPlatform)
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index 74d387e353c5..2fbaa76c6a43 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -65,13 +65,21 @@ rec {
            "sandboxProfile" "propagatedSandboxProfile"])
         // (let
           computedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies);
+            lib.concatMap (input: input.__propagatedSandboxProfile or [])
+              (stdenv.extraNativeBuildInputs
+               ++ stdenv.extraBuildInputs
+               ++ lib.concatLists dependencies);
           computedPropagatedSandboxProfile =
-            lib.concatMap (input: input.__propagatedSandboxProfile or []) (lib.concatLists propagatedDependencies);
+            lib.concatMap (input: input.__propagatedSandboxProfile or [])
+              (lib.concatLists propagatedDependencies);
           computedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (stdenv.extraBuildInputs ++ lib.concatLists dependencies));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
+              (stdenv.extraNativeBuildInputs
+               ++ stdenv.extraBuildInputs
+               ++ lib.concatLists dependencies));
           computedPropagatedImpureHostDeps =
-            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or []) (lib.concatLists propagatedDependencies));
+            lib.unique (lib.concatMap (input: input.__propagatedImpureHostDeps or [])
+              (lib.concatLists propagatedDependencies));
         in
         {
           name = name + lib.optionalString
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 61262e1a64e5..0167e51f2fdd 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -47,7 +47,7 @@ let
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
   stageFun = prevStage:
-    { name, overrides ? (self: super: {}), extraBuildInputs ? [] }:
+    { name, overrides ? (self: super: {}), extraNativeBuildInputs ? [] }:
 
     let
 
@@ -56,7 +56,7 @@ let
         buildPlatform = localSystem;
         hostPlatform = localSystem;
         targetPlatform = localSystem;
-        inherit config extraBuildInputs;
+        inherit config extraNativeBuildInputs;
         preHook =
           ''
             # Don't patch #!/interpreter because it leads to retained
@@ -219,7 +219,7 @@ in
         isl = isl_0_14;
       };
     };
-    extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
+    extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
       # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
       lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
   })
@@ -253,7 +253,7 @@ in
         shell = self.bash + "/bin/bash";
       };
     };
-    extraBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
+    extraNativeBuildInputs = [ prevStage.patchelf prevStage.xz ] ++
       # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
       lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
   })
@@ -283,7 +283,7 @@ in
       initialPath =
         ((import ../common-path.nix) {pkgs = prevStage;});
 
-      extraBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
+      extraNativeBuildInputs = [ prevStage.patchelf prevStage.paxctl ] ++
         # Many tarballs come with obsolete config.sub/config.guess that don't recognize aarch64.
         lib.optional (system == "aarch64-linux") prevStage.updateAutotoolsGnuConfigScriptsHook;
 
diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 02734f2f3e59..9ecb56028bc0 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -66,7 +66,7 @@ let
     export lt_cv_deplibs_check_method=pass_all
   '';
 
-  extraBuildInputsCygwin = [
+  extraNativeBuildInputsCygwin = [
     ../cygwin/all-buildinputs-as-runtimedep.sh
     ../cygwin/wrap-exes-to-find-dlls.sh
   ] ++ (if system == "i686-cygwin" then [
@@ -94,9 +94,9 @@ let
         if system == "x86_64-cygwin" then prehookCygwin else
         prehookBase;
 
-      extraBuildInputs =
-        if system == "i686-cygwin" then extraBuildInputsCygwin else
-        if system == "x86_64-cygwin" then extraBuildInputsCygwin else
+      extraNativeBuildInputs =
+        if system == "i686-cygwin" then extraNativeBuildInputsCygwin else
+        if system == "x86_64-cygwin" then extraNativeBuildInputsCygwin else
         [];
 
       initialPath = extraPath ++ path;

From 41abe41fd946c567f80356d6cc439b13970c6924 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 18 Aug 2017 13:00:24 -0400
Subject: [PATCH 03/75] binutils: Pass --build --host on non-arm

This is needed for build != host == target builds. Moreoever, we want
to move towards always passing all 3, and the previous change to
unbreak Arm moved us away from that.
---
 pkgs/development/tools/misc/binutils/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index e02cf1667cdf..a528cb0bba93 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -84,7 +84,12 @@ stdenv.mkDerivation rec {
     else "-static-libgcc";
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = stdenv.lib.optionals (targetPlatform != hostPlatform) [ "build" "host" "target" ];
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags =
     [ "--enable-shared" "--enable-deterministic-archives" "--disable-werror" ]
     ++ optional (stdenv.system == "mips64el-linux") "--enable-fix-loongson2f-nop"

From 4ab93f82364c741c2abc705c1f09618f4e77cec4 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 21 Aug 2017 04:10:42 -0400
Subject: [PATCH 04/75] expat: 2.2.3 -> 2.2.4

---
 pkgs/development/libraries/expat/default.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 0a2deab796bb..6533997de2f8 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,33 +1,26 @@
 { stdenv, fetchpatch, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.3";
+  name = "expat-2.2.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "0pyfma0sv4vif17kfv7xh2l2hl6skgw266a9cwm00p7q0bxr065k";
+    sha256 = "17h1fb9zvqvf0sr78j211bngc6jpql5wzar8fg9b52jzjvdqbb83";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
   outputBin = "dev";
 
-  patches = [
-    (fetchpatch {
-      name = "fix-aarch-build.patch";
-      url = "https://github.com/libexpat/libexpat/commit/d98d4399174fd6f71d70e7bd89993a0e7346753d.patch";
-      sha256 = "0z89wb4mzyf7vvl6kbflk5w1z7yc39jwvs3mkznin5agj34x063w";
-      stripLen = 1;
-      excludes = [ "coverage.sh" ];
-    })
-  ];
-
   configureFlags = stdenv.lib.optional stdenv.isFreeBSD "--with-pic";
 
   outputMan = "dev"; # tiny page for a dev tool
 
   doCheck = true;
 
-  preCheck = "patchShebangs ./run.sh";
+  preCheck = ''
+    patchShebangs ./run.sh
+    patchShebangs ./test-driver-wrapper.sh
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;

From ad8d5649a24b6438ceda0fe36aab82ef2428f5db Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Sat, 19 Aug 2017 22:16:35 +0100
Subject: [PATCH 05/75] set +u workaround for empty arrays

libDirs can be empty, which in combination with "set -u" of
9f1e009975dc2d58541de435c74a26afe011542a will cause a variable unbound
error on old bash versions
---
 pkgs/build-support/cc-wrapper/ld-wrapper.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index d5fdc837cf5f..a775b6da8237 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -121,7 +121,7 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
     # It's important to add the rpath in the order of -L..., so
     # the link time chosen objects will be those of runtime linking.
     declare -A rpaths
-    for dir in "${libDirs[@]}"; do
+    for dir in ${libDirs+"${libDirs[@]}"}; do
         if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then
             dir="$dir2"
         fi

From 267efdc4750df6c6dbfaad9299b83f3d8f255669 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 21 Aug 2017 20:34:03 +0200
Subject: [PATCH 06/75] valgrind: 3.12.0 -> 3.13.0

fetching from sourceware, as linked on http://valgrind.org/downloads/
---
 pkgs/development/tools/analysis/valgrind/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix
index 80e3fdfc8072..21dba34e8843 100644
--- a/pkgs/development/tools/analysis/valgrind/default.nix
+++ b/pkgs/development/tools/analysis/valgrind/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, fetchpatch, perl, gdb, llvm, cctools, xnu, bootstrap_cmds }:
 
 stdenv.mkDerivation rec {
-  name = "valgrind-3.12.0";
+  name = "valgrind-3.13.0";
 
   src = fetchurl {
-    url = "http://valgrind.org/downloads/${name}.tar.bz2";
-    sha256 = "18bnrw9b1d55wi1wnl68n25achsp9w48n51n1xw4fwjjnaal7jk7";
+    url = "https://sourceware.org/pub/valgrind/${name}.tar.bz2";
+    sha256 = "0fqc3684grrbxwsic1rc5ryxzxmigzjx9p5vf3lxa37h0gpq0rnp";
   };
 
   outputs = [ "out" "dev" "man" "doc" ];

From c860c02deff91beefa6f96e48939b517542c6c85 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 21 Aug 2017 19:55:42 +0200
Subject: [PATCH 07/75] tcpdump: 4.9.0 -> 4.9.1

- fetch from GitHub instead of debian mirror
---
 pkgs/tools/networking/tcpdump/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix
index a7130a3891b9..77e74569ee55 100644
--- a/pkgs/tools/networking/tcpdump/default.nix
+++ b/pkgs/tools/networking/tcpdump/default.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchurl, libpcap, enableStatic ? false
+{ stdenv, fetchFromGitHub, libpcap, enableStatic ? false
 , hostPlatform
 }:
 
 stdenv.mkDerivation rec {
   name = "tcpdump-${version}";
-  version = "4.9.0";
+  version = "4.9.1";
 
-  src = fetchurl {
-    #url = "http://www.tcpdump.org/release/${name}.tar.gz";
-    url = "mirror://debian/pool/main/t/tcpdump/tcpdump_${version}.orig.tar.gz";
-    sha256 = "0pjsxsy8l71i813sa934cwf1ryp9xbr7nxwsvnzavjdirchq3sga";
+  src = fetchFromGitHub rec {
+    owner = "the-tcpdump-group";
+    repo = "tcpdump";
+    rev = "${repo}-${version}";
+    sha256 = "1vzrvn1q7x28h18yskqc390y357pzpg5xd3pzzj4xz3llnvsr64p";
   };
 
   buildInputs = [ libpcap ];

From f21a5c2f57131b77ba6174768d8664f3cc80fe75 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 21 Aug 2017 18:50:47 +0200
Subject: [PATCH 08/75] qjson: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index 6ab134a03064..29202396c058 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, qt4 }:
 
 stdenv.mkDerivation rec {
-  version = "0.8.1";
+  version = "0.9.0";
   name = "qjson-${version}";
 
   src = fetchFromGitHub {
     owner = "flavio";
     repo = "qjson";
     rev = "${version}";
-    sha256 = "1rb3ydrhyd4bczqzfv0kqpi2mx4hlpq1k8jvnwpcmvyaypqpqg59";
+    sha256 = "1f4wnxzx0qdmxzc7hqk28m0sva7z9p9xmxm6aifvjlp0ha6pmfxs";
   };
 
   buildInputs = [ cmake qt4 ];

From 50736110821fc671fbc322d322419387f23073b1 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 21 Aug 2017 18:14:14 +0200
Subject: [PATCH 09/75] rmlint: 2.4.4 -> 2.6.1

- version bump: 2.4.4 -> 2.6.1
- fetchurl -> fetchFromGitHub
- hompage: http -> https
---
 pkgs/tools/misc/rmlint/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/rmlint/default.nix b/pkgs/tools/misc/rmlint/default.nix
index e962bcb0155d..e321670068cf 100644
--- a/pkgs/tools/misc/rmlint/default.nix
+++ b/pkgs/tools/misc/rmlint/default.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl
-, gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }:
+{ stdenv, fetchFromGitHub,
+  gettext, glib, json_glib, libelf, pkgconfig, scons, sphinx, utillinux }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "rmlint-${version}";
-  version = "2.4.4";
+  version = "2.6.1";
 
-  src = fetchurl {
-    url = "https://github.com/sahib/rmlint/archive/v${version}.tar.gz";
-    sha256 = "1g38wmf58m9lbdngfsbz3dbkd44yqxppzvgi5mwag0w7r7khhir9";
+  src = fetchFromGitHub {
+    owner = "sahib";
+    repo = "rmlint";
+    rev = "v${version}";
+    sha256 = "1j09qk3zypw4my713q9g36kq37ggqd5v9vrs3h821p6p3qmmkdn8";
   };
 
   configurePhase = "scons config";
@@ -21,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Extremely fast tool to remove duplicates and other lint from your filesystem";
-    homepage = http://rmlint.readthedocs.org;
+    homepage = https://rmlint.readthedocs.org;
     platforms = platforms.linux;
     license = licenses.gpl3;
     maintainers = [ maintainers.koral ];

From 221f5f00e30870dc4f1ea06e78b5e27b30ec9b16 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Mon, 21 Aug 2017 17:49:14 +0200
Subject: [PATCH 10/75] rawdog: 2.21 -> 2.22, http -> https

---
 .../networking/feedreaders/rawdog/default.nix             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 41f578759dfd..72a98a996046 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -2,11 +2,11 @@
 
 python2Packages.buildPythonApplication rec {
   name = "rawdog-${version}";
-  version = "2.21";
+  version = "2.22";
 
   src = fetchurl {
-    url = "http://offog.org/files/${name}.tar.gz";
-    sha256 = "0f5z7b70pyhjl6s28hgxninsr86s4dj5ycd50sv6bfz4hm1c2030";
+    url = "https://offog.org/files/${name}.tar.gz";
+    sha256 = "01ircwl80xi5lamamsb22i7vmsh2ysq3chn9mbsdhqic2i32hcz0";
   };
 
   propagatedBuildInputs = with python2Packages; [ feedparser ];
@@ -14,7 +14,7 @@ python2Packages.buildPythonApplication rec {
   namePrefix = "";
 
   meta = with stdenv.lib; {
-    homepage = http://offog.org/code/rawdog/;
+    homepage = https://offog.org/code/rawdog/;
     description = "RSS Aggregator Without Delusions Of Grandeur";
     license = licenses.gpl2;
     platforms = platforms.unix;

From e6661db29f05b4e18fb881b51c4a4d171318f56e Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Thu, 17 Aug 2017 10:19:08 +0200
Subject: [PATCH 11/75] ncurses: 6.0 -> 6.0-20170729

Bump version to include a patch that fixes #19785.
---
 pkgs/development/libraries/ncurses/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix
index 827a556a4688..e2c3907e856a 100644
--- a/pkgs/development/libraries/ncurses/default.nix
+++ b/pkgs/development/libraries/ncurses/default.nix
@@ -9,19 +9,18 @@
 , buildPlatform, hostPlatform
 , buildPackages
 }:
-let
-  version = if abiVersion == "5" then "5.9" else "6.0";
-  sha256 = if abiVersion == "5"
-    then "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh"
-    else "0q3jck7lna77z5r42f13c4xglc7azd19pxfrjrpgp2yf615w4lgm";
-in
+
 stdenv.mkDerivation rec {
+  version = if abiVersion == "5" then "5.9" else "6.0-20170729";
   name = "ncurses-${version}";
 
-  src = fetchurl {
+  src = fetchurl (if abiVersion == "5" then {
     url = "mirror://gnu/ncurses/${name}.tar.gz";
-    inherit sha256;
-  };
+    sha256 = "0fsn7xis81za62afan0vvm38bvgzg5wfmv1m86flqcj0nj7jjilh";
+  } else {
+    url = "ftp://ftp.invisible-island.net/ncurses/current/${name}.tgz";
+    sha256 = "1cfdpl2gnj8szw28jmzrw47va0yqn16g03ywyzz3bjmaqxxmmwga";
+  });
 
   patches = [ ./clang.patch ] ++ lib.optional (abiVersion == "5" && stdenv.cc.isGNU) ./gcc-5.patch;
 

From 71186e73455a4e06e96a31da34b76f84e545ba1f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 18 Aug 2017 13:54:09 -0400
Subject: [PATCH 12/75] gcc: Use `configurePlatforms` to control --build,
 --host, and --target

---
 pkgs/development/compilers/gcc/4.5/default.nix      | 4 ++--
 pkgs/development/compilers/gcc/4.8/default.nix      | 4 ++--
 pkgs/development/compilers/gcc/4.9/default.nix      | 4 ++--
 pkgs/development/compilers/gcc/5/default.nix        | 6 ++----
 pkgs/development/compilers/gcc/6/default.nix        | 4 ++--
 pkgs/development/compilers/gcc/7/default.nix        | 4 ++--
 pkgs/development/compilers/gcc/snapshot/default.nix | 4 ++--
 7 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 971726b8ab90..fe0ed930a690 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -73,7 +73,6 @@ let version = "4.5.4";
     crossMingw = (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt");
 
     crossConfigureFlags =
-      "--target=${targetPlatform.config}" +
       withArch +
       withCpu +
       withAbi +
@@ -231,6 +230,8 @@ stdenv.mkDerivation ({
     ++ (optionals langVhdl [gnat])
     ;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if enableMultilib then "" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
@@ -313,7 +314,6 @@ stdenv.mkDerivation ({
       ${if langAda then " --enable-libada" else ""}
       ${if targetplatform == hostPlatform && targetPlatform.isi686 then "--with-arch=i686" else ""}
       ${if targetPlatform != hostPlatform then crossConfigureFlags else ""}
-      --target=${targetPlatform.config}
     '';
   };
  
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 7a41ba38e519..877b71e0169d 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -142,7 +142,6 @@ let version = "4.8.5";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -317,6 +316,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -436,7 +437,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index e45ee0bcc6a7..02c8b4495674 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -136,7 +136,6 @@ let version = "4.9.4";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -317,6 +316,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -434,7 +435,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 57b68d1a11f1..3c613d40dff0 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -142,7 +142,6 @@ let version = "5.4.0";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -334,6 +333,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -451,9 +452,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --build=${buildPlatform.config}
-      --host=${hostPlatform.config}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index fa42bb5b8512..87c5b11c5e12 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -136,7 +136,6 @@ let version = "6.4.0";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -326,6 +325,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -443,7 +444,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 67b7dee446fb..e1206c638f55 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -137,7 +137,6 @@ let version = "7.1.0";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -328,6 +327,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -445,7 +446,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 518ee5c7054b..210b51dbca08 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -137,7 +137,6 @@ let version = "7-20170409";
         withFloat = if gccFloat != null then " --with-float=${gccFloat}" else "";
         withMode = if gccMode != null then " --with-mode=${gccMode}" else "";
       in
-        "--target=${targetPlatform.config}" +
         withArch +
         withCpu +
         withAbi +
@@ -315,6 +314,8 @@ stdenv.mkDerivation ({
 
   dontDisableStatic = true;
 
+  # TODO(@Ericson2314): Always pass "--target" and always prefix.
+  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
@@ -432,7 +433,6 @@ stdenv.mkDerivation ({
         )
       }
       ${if langAda then " --enable-libada" else ""}
-      --target=${targetPlatform.config}
       ${xwithArch}
       ${xwithCpu}
       ${xwithAbi}

From ebc9b161cd184502bf4912b9348a507e2d0540da Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 14:34:33 -0400
Subject: [PATCH 13/75] gcc: Add `configurePlatforms` exception for Arm 32

...just as we did for binutils. When the underlying issue is resolved
(probably with a configure script patch or lib/systems/parse.nix
change), this should be reverted.
---
 pkgs/development/compilers/gcc/4.5/default.nix      | 7 ++++++-
 pkgs/development/compilers/gcc/4.8/default.nix      | 7 ++++++-
 pkgs/development/compilers/gcc/4.9/default.nix      | 7 ++++++-
 pkgs/development/compilers/gcc/5/default.nix        | 7 ++++++-
 pkgs/development/compilers/gcc/6/default.nix        | 7 ++++++-
 pkgs/development/compilers/gcc/7/default.nix        | 7 ++++++-
 pkgs/development/compilers/gcc/snapshot/default.nix | 7 ++++++-
 7 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index fe0ed930a690..4c52f4447d54 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -231,7 +231,12 @@ stdenv.mkDerivation ({
     ;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if enableMultilib then "" else "--disable-multilib"}
     ${if enableShared then "" else "--disable-shared"}
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 877b71e0169d..76fa0b663752 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -317,7 +317,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 02c8b4495674..05bdcecb6a55 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -317,7 +317,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 3c613d40dff0..90b10f2acbd3 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -334,7 +334,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index 87c5b11c5e12..bc408e28f589 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -326,7 +326,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index e1206c638f55..78b499f096da 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -328,7 +328,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index 210b51dbca08..c7f7b9d970a2 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -315,7 +315,12 @@ stdenv.mkDerivation ({
   dontDisableStatic = true;
 
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
-  configurePlatforms = [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+  configurePlatforms =
+    # TODO(@Ericson2314): Figure out what's going wrong with Arm
+    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    then []
+    else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
+
   configureFlags = "
     ${if hostPlatform.isSunOS then
       " --enable-long-long --enable-libssp --enable-threads=posix --disable-nls --enable-__cxa_atexit " +

From 81194eef45e2c03018687be60c2c695a1729df36 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 9 Aug 2017 01:20:56 -0400
Subject: [PATCH 14/75] stdenv-setup: Use `set -u` as much as possible

Older bash version, like those in the bootstrap tools and on macOS,
currently confuse variables defined as an empty array with undefined
variables. `${foo+"${foo[@]}"}` will prevent `set -u` problems with
empty arrays and older without making a single '' in the empty case.

Care is taken to `set +u` when running hooks so as to not break existing
packages.
---
 pkgs/stdenv/generic/setup.sh | 280 ++++++++++++++++++++++-------------
 1 file changed, 177 insertions(+), 103 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index b6bca3e1f562..d3fff57507c6 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -1,4 +1,4 @@
-set -e
+set -eu
 set -o pipefail
 
 : ${outputs:=out}
@@ -13,16 +13,22 @@ set -o pipefail
 # code). The hooks for <hookName> are the shell function or variable
 # <hookName>, and the values of the shell array ‘<hookName>Hooks’.
 runHook() {
+    local oldOpts="$(shopt -po nounset)"
+    set -u # May be called from elsewhere, so do `set -u`.
+
     local hookName="$1"
     shift
-    local var="$hookName"
-    if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
+    local hooksSlice="${hookName%Hook}Hooks[@]"
 
-    local varRef="$var[@]"
     local hook
-    for hook in "_callImplicitHook 0 $hookName" "${!varRef}"; do
+    # Hack around old bash being bad and thinking empty arrays are
+    # undefined.
+    for hook in "_callImplicitHook 0 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do
         _eval "$hook" "$@"
+        set -u # To balance `_eval`
     done
+
+    eval "${oldOpts}"
     return 0
 }
 
@@ -30,19 +36,25 @@ runHook() {
 # Run all hooks with the specified name, until one succeeds (returns a
 # zero exit code). If none succeed, return a non-zero exit code.
 runOneHook() {
+    local oldOpts="$(shopt -po nounset)"
+    set -u # May be called from elsewhere, so do `set -u`.
+
     local hookName="$1"
     shift
-    local var="$hookName"
-    if [[ "$hookName" =~ Hook$ ]]; then var+=s; else var+=Hooks; fi
+    local hooksSlice="${hookName%Hook}Hooks[@]"
 
-    local varRef="$var[@]"
-    local hook
-    for hook in "_callImplicitHook 1 $hookName" "${!varRef}"; do
+    local hook ret=1
+    # Hack around old bash like above
+    for hook in "_callImplicitHook 1 $hookName" ${!hooksSlice+"${!hooksSlice}"}; do
         if _eval "$hook" "$@"; then
-            return 0
+            ret=0
+            break
         fi
+        set -u # To balance `_eval`
     done
-    return 1
+
+    eval "${oldOpts}"
+    return "$ret"
 }
 
 
@@ -52,27 +64,42 @@ runOneHook() {
 # environment variables) and from shell scripts (as functions). If you
 # want to allow multiple hooks, use runHook instead.
 _callImplicitHook() {
+    set -u
     local def="$1"
     local hookName="$2"
     case "$(type -t "$hookName")" in
-        (function|alias|builtin) "$hookName";;
-        (file) source "$hookName";;
+        (function|alias|builtin)
+            set +u
+            "$hookName";;
+        (file)
+            set +u
+            source "$hookName";;
         (keyword) :;;
-        (*) if [ -z "${!hookName}" ]; then return "$def"; else eval "${!hookName}"; fi;;
+        (*) if [ -z "${!hookName:-}" ]; then
+                return "$def";
+            else
+                set +u
+                eval "${!hookName}"
+            fi;;
     esac
+    # `_eval` expects hook to need nounset disable and leave it
+    # disabled anyways, so Ok to to delegate. The alternative of a
+    # return trap is no good because it would affect nested returns.
 }
 
 
 # A function wrapper around ‘eval’ that ensures that ‘return’ inside
-# hooks exits the hook, not the caller.
+# hooks exits the hook, not the caller. Also will only pass args if
+# command can take them
 _eval() {
-    local code="$1"
-    shift
-    if [ "$(type -t "$code")" = function ]; then
-        eval "$code \"\$@\""
+    if [ "$(type -t "$1")" = function ]; then
+        set +u
+        "$@" # including args
     else
-        eval "$code"
+        set +u
+        eval "$1"
     fi
+    # `run*Hook` reenables `set -u`
 }
 
 
@@ -103,7 +130,7 @@ exitHandler() {
     exitCode="$?"
     set +e
 
-    if [ -n "$showBuildStats" ]; then
+    if [ -n "${showBuildStats:-}" ]; then
         times > "$NIX_BUILD_TOP/.times"
         local -a times=($(cat "$NIX_BUILD_TOP/.times"))
         # Print the following statistics:
@@ -114,14 +141,14 @@ exitHandler() {
         echo "build time elapsed: " "${times[@]}"
     fi
 
-    if [ "$exitCode" != 0 ]; then
+    if (( "$exitCode" != 0 )); then
         runHook failureHook
 
         # If the builder had a non-zero exit code and
         # $succeedOnFailure is set, create the file
         # ‘$out/nix-support/failed’ to signal failure, and exit
         # normally.  Otherwise, return the original exit code.
-        if [ -n "$succeedOnFailure" ]; then
+        if [ -n "${succeedOnFailure:-}" ]; then
             echo "build failed with exit code $exitCode (ignored)"
             mkdir -p "$out/nix-support"
             printf "%s" "$exitCode" > "$out/nix-support/failed"
@@ -147,7 +174,7 @@ addToSearchPathWithCustomDelimiter() {
     local varName="$2"
     local dir="$3"
     if [ -d "$dir" ]; then
-        export "${varName}=${!varName}${!varName:+$delimiter}${dir}"
+        export "${varName}=${!varName:+${!varName}${delimiter}}${dir}"
     fi
 }
 
@@ -171,12 +198,12 @@ ensureDir() {
 # The function is used in multiple-outputs.sh hook,
 # so it is defined here but tried after the hook.
 _addRpathPrefix() {
-    if [ "$NIX_NO_SELF_RPATH" != 1 ]; then
+    if [ "${NIX_NO_SELF_RPATH:-0}" != 1 ]; then
         export NIX_LDFLAGS="-rpath $1/lib $NIX_LDFLAGS"
-        if [ -n "$NIX_LIB64_IN_SELF_RPATH" ]; then
+        if [ -n "${NIX_LIB64_IN_SELF_RPATH:-}" ]; then
             export NIX_LDFLAGS="-rpath $1/lib64 $NIX_LDFLAGS"
         fi
-        if [ -n "$NIX_LIB32_IN_SELF_RPATH" ]; then
+        if [ -n "${NIX_LIB32_IN_SELF_RPATH:-}" ]; then
             export NIX_LDFLAGS="-rpath $1/lib32 $NIX_LDFLAGS"
         fi
     fi
@@ -242,13 +269,13 @@ for i in $initialPath; do
     addToSearchPath PATH "$i/bin"
 done
 
-if [ "$NIX_DEBUG" = 1 ]; then
+if [ "${NIX_DEBUG:-}" = 1 ]; then
     echo "initial path: $PATH"
 fi
 
 
 # Check that the pre-hook initialised SHELL.
-if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi
+if [ -z "${SHELL:-}" ]; then echo "SHELL not set"; exit 1; fi
 BASH="$SHELL"
 export CONFIG_SHELL="$SHELL"
 
@@ -259,7 +286,7 @@ paxmark() { true; }
 
 
 # Execute the pre-hook.
-if [ -z "$shell" ]; then export shell="$SHELL"; fi
+if [ -z "${shell:-}" ]; then export shell="$SHELL"; fi
 runHook preHook
 
 
@@ -279,11 +306,12 @@ findInputs() {
     # nix-shell doesn't use impure bash. This should replace the O(n)
     # case with an O(1) hash map lookup, assuming bash is implemented
     # well :D.
-    local varRef="$var[*]"
-
-    case "${!varRef}" in
+    local varSlice="$var[*]"
+    # ${..-} to hack around old bash empty array problem
+    case "${!varSlice-}" in
         *" $pkg "*) return 0 ;;
     esac
+    unset -v varSlice
 
     eval "$var"'+=("$pkg")'
 
@@ -293,7 +321,10 @@ findInputs() {
     fi
 
     if [ -f "$pkg" ]; then
+        local oldOpts="$(shopt -po nounset)"
+        set +u
         source "$pkg"
+        eval "$oldOpts"
     fi
 
     if [ -d "$pkg/bin" ]; then
@@ -301,7 +332,10 @@ findInputs() {
     fi
 
     if [ -f "$pkg/nix-support/setup-hook" ]; then
+        local oldOpts="$(shopt -po nounset)"
+        set +u
         source "$pkg/nix-support/setup-hook"
+        eval "$oldOpts"
     fi
 
     if [ -f "$pkg/nix-support/$propagatedBuildInputsFile" ]; then
@@ -312,23 +346,22 @@ findInputs() {
     fi
 }
 
-if [ -z "$crossConfig" ]; then
+declare -a nativePkgs crossPkgs
+if [ -z "${crossConfig:-}" ]; then
     # Not cross-compiling - both buildInputs (and variants like propagatedBuildInputs)
     # are handled identically to nativeBuildInputs
-    declare -a nativePkgs
-    for i in $nativeBuildInputs $buildInputs \
-             $defaultNativeBuildInputs $defaultBuildInputs \
-             $propagatedNativeBuildInputs $propagatedBuildInputs; do
+    for i in ${nativeBuildInputs:-} ${buildInputs:-} \
+             ${defaultNativeBuildInputs:-} ${defaultBuildInputs:-} \
+             ${propagatedNativeBuildInputs:-} ${propagatedBuildInputs:-}; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 else
-    declare -a crossPkgs
-    for i in $buildInputs $defaultBuildInputs $propagatedBuildInputs; do
+    for i in ${buildInputs:-} ${defaultBuildInputs:-} ${propagatedBuildInputs:-}; do
         findInputs "$i" crossPkgs propagated-build-inputs
     done
 
     declare -a nativePkgs
-    for i in $nativeBuildInputs $defaultNativeBuildInputs $propagatedNativeBuildInputs; do
+    for i in ${nativeBuildInputs:-} ${defaultNativeBuildInputs:-} ${propagatedNativeBuildInputs:-}; do
         findInputs "$i" nativePkgs propagated-native-build-inputs
     done
 fi
@@ -355,7 +388,8 @@ _addToNativeEnv() {
     runHook envHook "$pkg"
 }
 
-for i in "${nativePkgs[@]}"; do
+# Old bash empty array hack
+for i in ${nativePkgs+"${nativePkgs[@]}"}; do
     _addToNativeEnv "$i"
 done
 
@@ -367,7 +401,8 @@ _addToCrossEnv() {
     runHook crossEnvHook "$pkg"
 }
 
-for i in "${crossPkgs[@]}"; do
+# Old bash empty array hack
+for i in ${crossPkgs+"${crossPkgs[@]}"}; do
     _addToCrossEnv "$i"
 done
 
@@ -384,17 +419,17 @@ export TZ=UTC
 # Set the prefix.  This is generally $out, but it can be overriden,
 # for instance if we just want to perform a test build/install to a
 # temporary location and write a build report to $out.
-if [ -z "$prefix" ]; then
+if [ -z "${prefix:-}" ]; then
     prefix="$out";
 fi
 
-if [ "$useTempPrefix" = 1 ]; then
+if [ "${useTempPrefix:-}" = 1 ]; then
     prefix="$NIX_BUILD_TOP/tmp_prefix";
 fi
 
 
-PATH=$_PATH${_PATH:+:}$PATH
-if [ "$NIX_DEBUG" = 1 ]; then
+PATH="${_PATH-}${_PATH:+${PATH:+:}}$PATH"
+if [ "${NIX_DEBUG:-}" = 1 ]; then
     echo "final path: $PATH"
 fi
 
@@ -423,7 +458,7 @@ export NIX_BUILD_CORES
 # Prevent OpenSSL-based applications from using certificates in
 # /etc/ssl.
 # Leave it in shells for convenience.
-if [ -z "$SSL_CERT_FILE" ] && [ -z "$IN_NIX_SHELL" ]; then
+if [ -z "${SSL_CERT_FILE:-}" ] && [ -z "${IN_NIX_SHELL:-}" ]; then
   export SSL_CERT_FILE=/no-cert-file.crt
 fi
 
@@ -508,7 +543,7 @@ substituteAll() {
 
     # Select all environment variables that start with a lowercase character.
     for varName in $(env | sed -e $'s/^\([a-z][^= \t]*\)=.*/\\1/; t \n d'); do
-        if [ "$NIX_DEBUG" = "1" ]; then
+        if [ "${NIX_DEBUG:-}" = "1" ]; then
             echo "@${varName}@ -> '${!varName}'"
         fi
         args+=("--subst-var" "$varName")
@@ -535,7 +570,7 @@ substituteAllInPlace() {
 # then go to the build directory and source in `env-vars' to reproduce
 # the environment used for building.
 dumpVars() {
-    if [ "$noDumpEnvVars" != 1 ]; then
+    if [ "${noDumpEnvVars:-0}" != 1 ]; then
         export > "$NIX_BUILD_TOP/env-vars" || true
     fi
 }
@@ -600,8 +635,8 @@ unpackFile() {
 unpackPhase() {
     runHook preUnpack
 
-    if [ -z "$srcs" ]; then
-        if [ -z "$src" ]; then
+    if [ -z "${srcs:-}" ]; then
+        if [ -z "${src:-}" ]; then
             # shellcheck disable=SC2016
             echo 'variable $src or $srcs should point to the source'
             exit 1
@@ -626,10 +661,13 @@ unpackPhase() {
     done
 
     # Find the source directory.
-    if [ -n "$setSourceRoot" ]; then
+
+    # set to empty if unset
+    : ${sourceRoot=}
+
+    if [ -n "${setSourceRoot:-}" ]; then
         runOneHook setSourceRoot
     elif [ -z "$sourceRoot" ]; then
-        sourceRoot=
         for i in *; do
             if [ -d "$i" ]; then
                 case $dirsBefore in
@@ -657,7 +695,7 @@ unpackPhase() {
     # By default, add write permission to the sources.  This is often
     # necessary when sources have been copied from other store
     # locations.
-    if [ "$dontMakeSourcesWritable" != 1 ]; then
+    if [ "${dontMakeSourcesWritable:-0}" != 1 ]; then
         chmod -R u+w "$sourceRoot"
     fi
 
@@ -668,7 +706,7 @@ unpackPhase() {
 patchPhase() {
     runHook prePatch
 
-    for i in $patches; do
+    for i in ${patches:-}; do
         header "applying patch $i" 3
         local uncompress=cat
         case "$i" in
@@ -702,11 +740,15 @@ fixLibtool() {
 configurePhase() {
     runHook preConfigure
 
+    # set to empty if unset
+    : ${configureScript=}
+    : ${configureFlags=}
+
     if [[ -z "$configureScript" && -x ./configure ]]; then
         configureScript=./configure
     fi
 
-    if [ -z "$dontFixLibtool" ]; then
+    if [ -z "${dontFixLibtool:-}" ]; then
         local i
         find . -iname "ltmain.sh" -print0 | while IFS='' read -r -d '' i; do
             echo "fixing libtool script $i"
@@ -714,27 +756,30 @@ configurePhase() {
         done
     fi
 
-    if [[ -z "$dontAddPrefix" && -n "$prefix" ]]; then
+    if [[ -z "${dontAddPrefix:-}" && -n "$prefix" ]]; then
         configureFlags="${prefixKey:---prefix=}$prefix $configureFlags"
     fi
 
     # Add --disable-dependency-tracking to speed up some builds.
-    if [ -z "$dontAddDisableDepTrack" ]; then
+    if [ -z "${dontAddDisableDepTrack:-}" ]; then
         if [ -f "$configureScript" ] && grep -q dependency-tracking "$configureScript"; then
             configureFlags="--disable-dependency-tracking $configureFlags"
         fi
     fi
 
     # By default, disable static builds.
-    if [ -z "$dontDisableStatic" ]; then
+    if [ -z "${dontDisableStatic:-}" ]; then
         if [ -f "$configureScript" ] && grep -q enable-static "$configureScript"; then
             configureFlags="--disable-static $configureFlags"
         fi
     fi
 
     if [ -n "$configureScript" ]; then
+        # Old bash empty array hack
         # shellcheck disable=SC2086
-        local flagsArray=($configureFlags "${configureFlagsArray[@]}")
+        local flagsArray=(
+            $configureFlags ${configureFlagsArray+"${configureFlagsArray[@]}"}
+        )
         echoCmd 'configure flags' "${flagsArray[@]}"
         # shellcheck disable=SC2086
         $configureScript "${flagsArray[@]}"
@@ -750,17 +795,22 @@ configurePhase() {
 buildPhase() {
     runHook preBuild
 
-    if [[ -z "$makeFlags" && ! ( -n "$makefile" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
+    # set to empty if unset
+    : ${makeFlags=}
+
+    if [[ -z "$makeFlags" && ! ( -n "${makefile:-}" || -e Makefile || -e makefile || -e GNUmakefile ) ]]; then
         echo "no Makefile, doing nothing"
     else
         # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409
         makeFlags="SHELL=$SHELL $makeFlags"
 
+        # Old bash empty array hack
         # shellcheck disable=SC2086
-        local flagsArray=( \
-            ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-            $makeFlags "${makeFlagsArray[@]}" \
-            $buildFlags "${buildFlagsArray[@]}")
+        local flagsArray=(
+            ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+            $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+            $buildFlags ${buildFlagsArray+"${buildFlagsArray[@]}"}
+        )
 
         echoCmd 'build flags' "${flagsArray[@]}"
         make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -774,11 +824,14 @@ buildPhase() {
 checkPhase() {
     runHook preCheck
 
+    # Old bash empty array hack
     # shellcheck disable=SC2086
-    local flagsArray=( \
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-        $makeFlags "${makeFlagsArray[@]}" \
-        ${checkFlags:-VERBOSE=y} "${checkFlagsArray[@]}" ${checkTarget:-check})
+    local flagsArray=(
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+        ${checkFlags:-VERBOSE=y} ${checkFlagsArray+"${checkFlagsArray[@]}"}
+        ${checkTarget:-check}
+    )
 
     echoCmd 'check flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -797,10 +850,13 @@ installPhase() {
 
     installTargets="${installTargets:-install}"
 
+    # Old bash empty array hack
     # shellcheck disable=SC2086
-    local flagsArray=( $installTargets \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $installFlags "${installFlagsArray[@]}")
+    local flagsArray=(
+        $installTargets
+        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+        $installFlags ${installFlagsArray+"${installFlagsArray[@]}"}
+    )
 
     echoCmd 'install flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -830,39 +886,39 @@ fixupPhase() {
 
     # Propagate build inputs and setup hook into the development output.
 
-    if [ -z "$crossConfig" ]; then
+    if [ -z "${crossConfig:-}" ]; then
         # Not cross-compiling - propagatedBuildInputs are handled identically to propagatedNativeBuildInputs
         local propagated="$propagatedNativeBuildInputs"
-        if [ -n "$propagatedBuildInputs" ]; then
+        if [ -n "${propagatedBuildInputs:-}" ]; then
             propagated+="${propagated:+ }$propagatedBuildInputs"
         fi
-        if [ -n "$propagated" ]; then
+        if [ -n "${propagated:-}" ]; then
             mkdir -p "${!outputDev}/nix-support"
             # shellcheck disable=SC2086
             printWords $propagated > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     else
-        if [ -n "$propagatedBuildInputs" ]; then
+        if [ -n "${propagatedBuildInputs:-}" ]; then
             mkdir -p "${!outputDev}/nix-support"
             # shellcheck disable=SC2086
             printWords $propagatedBuildInputs > "${!outputDev}/nix-support/propagated-build-inputs"
         fi
 
-        if [ -n "$propagatedNativeBuildInputs" ]; then
+        if [ -n "${propagatedNativeBuildInputs:-}" ]; then
             mkdir -p "${!outputDev}/nix-support"
             # shellcheck disable=SC2086
             printWords $propagatedNativeBuildInputs > "${!outputDev}/nix-support/propagated-native-build-inputs"
         fi
     fi
 
-    if [ -n "$setupHook" ]; then
+    if [ -n "${setupHook:-}" ]; then
         mkdir -p "${!outputDev}/nix-support"
         substituteAll "$setupHook" "${!outputDev}/nix-support/setup-hook"
     fi
 
     # Propagate user-env packages into the output with binaries, TODO?
 
-    if [ -n "$propagatedUserEnvPkgs" ]; then
+    if [ -n "${propagatedUserEnvPkgs:-}" ]; then
         mkdir -p "${!outputBin}/nix-support"
         # shellcheck disable=SC2086
         printWords $propagatedUserEnvPkgs > "${!outputBin}/nix-support/propagated-user-env-packages"
@@ -875,11 +931,14 @@ fixupPhase() {
 installCheckPhase() {
     runHook preInstallCheck
 
+    # Old bash empty array hack
     # shellcheck disable=SC2086
-    local flagsArray=( \
-        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}} \
-        $makeFlags "${makeFlagsArray[@]}" \
-        $installCheckFlags "${installCheckFlagsArray[@]}" ${installCheckTarget:-installcheck})
+    local flagsArray=(
+        ${enableParallelBuilding:+-j${NIX_BUILD_CORES} -l${NIX_BUILD_CORES}}
+        $makeFlags ${makeFlagsArray+"${makeFlagsArray[@]}"}
+        $installCheckFlags ${installCheckFlagsArray+"${installCheckFlagsArray[@]}"}
+        ${installCheckTarget:-installcheck}
+    )
 
     echoCmd 'installcheck flags' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
@@ -892,13 +951,16 @@ installCheckPhase() {
 distPhase() {
     runHook preDist
 
+    # Old bash empty array hack
     # shellcheck disable=SC2086
-    local flagsArray=($distFlags "${distFlagsArray[@]}" ${distTarget:-dist})
+    local flagsArray=(
+        $distFlags ${distFlagsArray+"${distFlagsArray[@]}"} ${distTarget:-dist}
+    )
 
     echo 'dist flags: %q' "${flagsArray[@]}"
     make ${makefile:+-f $makefile} "${flagsArray[@]}"
 
-    if [ "$dontCopyDist" != 1 ]; then
+    if [ "${dontCopyDist:-0}" != 1 ]; then
         mkdir -p "$out/tarballs"
 
         # Note: don't quote $tarballs, since we explicitly permit
@@ -928,31 +990,37 @@ showPhaseHeader() {
 
 
 genericBuild() {
-    if [ -f "$buildCommandPath" ]; then
-        . "$buildCommandPath"
+    if [ -f "${buildCommandPath:-}" ]; then
+        local oldOpts="$(shopt -po nounset)"
+        set +u
+        source "$buildCommandPath"
+        eval "$oldOpts"
         return
     fi
-    if [ -n "$buildCommand" ]; then
+    if [ -n "${buildCommand:-}" ]; then
+        local oldOpts="$(shopt -po nounset)"
+        set +u
         eval "$buildCommand"
+        eval "$oldOpts"
         return
     fi
 
-    if [ -z "$phases" ]; then
-        phases="$prePhases unpackPhase patchPhase $preConfigurePhases \
-            configurePhase $preBuildPhases buildPhase checkPhase \
-            $preInstallPhases installPhase $preFixupPhases fixupPhase installCheckPhase \
-            $preDistPhases distPhase $postPhases";
+    if [ -z "${phases:-}" ]; then
+        phases="${prePhases:-} unpackPhase patchPhase ${preConfigurePhases:-} \
+            configurePhase ${preBuildPhases:-} buildPhase checkPhase \
+            ${preInstallPhases:-} installPhase ${preFixupPhases:-} fixupPhase installCheckPhase \
+            ${preDistPhases:-} distPhase ${postPhases:-}";
     fi
 
     for curPhase in $phases; do
-        if [[ "$curPhase" = buildPhase && -n "$dontBuild" ]]; then continue; fi
-        if [[ "$curPhase" = checkPhase && -z "$doCheck" ]]; then continue; fi
-        if [[ "$curPhase" = installPhase && -n "$dontInstall" ]]; then continue; fi
-        if [[ "$curPhase" = fixupPhase && -n "$dontFixup" ]]; then continue; fi
-        if [[ "$curPhase" = installCheckPhase && -z "$doInstallCheck" ]]; then continue; fi
-        if [[ "$curPhase" = distPhase && -z "$doDist" ]]; then continue; fi
+        if [[ "$curPhase" = buildPhase && -n "${dontBuild:-}" ]]; then continue; fi
+        if [[ "$curPhase" = checkPhase && -z "${doCheck:-}" ]]; then continue; fi
+        if [[ "$curPhase" = installPhase && -n "${dontInstall:-}" ]]; then continue; fi
+        if [[ "$curPhase" = fixupPhase && -n "${dontFixup:-}" ]]; then continue; fi
+        if [[ "$curPhase" = installCheckPhase && -z "${doInstallCheck:-}" ]]; then continue; fi
+        if [[ "$curPhase" = distPhase && -z "${doDist:-}" ]]; then continue; fi
 
-        if [[ -n "$tracePhases" ]]; then
+        if [[ -n "${tracePhases:-}" ]]; then
             echo
             echo "@ phase-started $out $curPhase"
         fi
@@ -962,13 +1030,16 @@ genericBuild() {
 
         # Evaluate the variable named $curPhase if it exists, otherwise the
         # function named $curPhase.
+        local oldOpts="$(shopt -po nounset)"
+        set +u
         eval "${!curPhase:-$curPhase}"
+        eval "$oldOpts"
 
         if [ "$curPhase" = unpackPhase ]; then
             cd "${sourceRoot:-.}"
         fi
 
-        if [ -n "$tracePhases" ]; then
+        if [ -n "${tracePhases:-}" ]; then
             echo
             echo "@ phase-succeeded $out $curPhase"
         fi
@@ -987,3 +1058,6 @@ runHook userHook
 
 
 dumpVars
+
+# Disable nounset for nix-shell.
+set +u

From 08f3a60e7bfeed422f7ab5f7ccfeeb0ad8175f92 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 17:09:47 -0400
Subject: [PATCH 15/75] cc-wrapper: Remove dead code

ccPath is only defined below, so this condition would never be true.

Worse, that's not quite true: what if somebody happend to have `/clang`
and no sandboxing. Boy, wouldn't that be annoying to debug!
---
 pkgs/build-support/cc-wrapper/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index b3971808a2b4..bc29de7918bf 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -217,13 +217,6 @@ stdenv.mkDerivation {
         echo "$gnatCFlags" > $out/nix-support/gnat-cflags
       ''}
 
-      if [ -e $ccPath/clang ]; then
-        # Need files like crtbegin.o from gcc
-        # It's unclear if these will ever be provided by an LLVM project
-        ccCFlags="$ccCFlags -B$basePath"
-        ccCFlags="$ccCFlags -isystem$cc/lib/clang/$ccVersion/include"
-      fi
-
       echo "$ccLDFlags" > $out/nix-support/cc-ldflags
       echo "$ccCFlags" > $out/nix-support/cc-cflags
 

From 0c0fad6141cf3d620ae17d69431a0d152c9fd73e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 24 Aug 2017 01:16:02 +0300
Subject: [PATCH 16/75] treewide: Consistently call ARM 'arm'

No need for silly differences.
---
 lib/systems/doubles.nix                             | 2 +-
 pkgs/build-support/cc-wrapper/default.nix           | 2 +-
 pkgs/build-support/gcc-wrapper-old/default.nix      | 2 +-
 pkgs/development/compilers/gcc/4.5/default.nix      | 2 +-
 pkgs/development/compilers/gcc/4.8/default.nix      | 2 +-
 pkgs/development/compilers/gcc/4.9/default.nix      | 2 +-
 pkgs/development/compilers/gcc/5/default.nix        | 2 +-
 pkgs/development/compilers/gcc/6/default.nix        | 2 +-
 pkgs/development/compilers/gcc/7/default.nix        | 2 +-
 pkgs/development/compilers/gcc/snapshot/default.nix | 2 +-
 pkgs/development/tools/misc/binutils/default.nix    | 2 +-
 pkgs/stdenv/generic/default.nix                     | 4 +---
 12 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 0168eb42f2f7..ac1a199d80c4 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -26,7 +26,7 @@ in rec {
   allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
   none = [];
 
-  arm     = filterDoubles predicates.isArm32;
+  arm     = filterDoubles predicates.isArm;
   i686    = filterDoubles predicates.isi686;
   mips    = filterDoubles predicates.isMips;
   x86_64  = filterDoubles predicates.isx86_64;
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index b3971808a2b4..05c1fe6fa541 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -66,7 +66,7 @@ let
     else if targetPlatform.system == "i686-linux"     then "${libc_lib}/lib/ld-linux.so.2"
     else if targetPlatform.system == "x86_64-linux"   then "${libc_lib}/lib/ld-linux-x86-64.so.2"
     # ARM with a wildcard, which can be "" or "-armhf".
-    else if targetPlatform.isArm32                    then "${libc_lib}/lib/ld-linux*.so.3"
+    else if targetPlatform.isArm                      then "${libc_lib}/lib/ld-linux*.so.3"
     else if targetPlatform.system == "aarch64-linux"  then "${libc_lib}/lib/ld-linux-aarch64.so.1"
     else if targetPlatform.system == "powerpc-linux"  then "${libc_lib}/lib/ld.so.1"
     else if targetPlatform.system == "mips64el-linux" then "${libc_lib}/lib/ld.so.1"
diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix
index a37d94c36e06..8d28879fb06f 100644
--- a/pkgs/build-support/gcc-wrapper-old/default.nix
+++ b/pkgs/build-support/gcc-wrapper-old/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation {
       (if targetPlatform.system == "i686-linux"     then "ld-linux.so.2" else
        if targetPlatform.system == "x86_64-linux"   then "ld-linux-x86-64.so.2" else
        # ARM with a wildcard, which can be "" or "-armhf".
-       if targetPlatform.isArm32                    then "ld-linux*.so.3" else
+       if targetPlatform.isArm                      then "ld-linux*.so.3" else
        if targetPlatform.system == "aarch64-linux"  then "ld-linux-aarch64.so.1" else
        if targetPlatform.system == "powerpc-linux"  then "ld.so.1" else
        if targetPlatform.system == "mips64el-linux" then "ld.so.1" else
diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix
index 4c52f4447d54..ea54e9b84f35 100644
--- a/pkgs/development/compilers/gcc/4.5/default.nix
+++ b/pkgs/development/compilers/gcc/4.5/default.nix
@@ -233,7 +233,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix
index 76fa0b663752..5b9d368c457b 100644
--- a/pkgs/development/compilers/gcc/4.8/default.nix
+++ b/pkgs/development/compilers/gcc/4.8/default.nix
@@ -319,7 +319,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index 05bdcecb6a55..8990302eea2e 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -319,7 +319,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix
index 90b10f2acbd3..f593e00ccfd4 100644
--- a/pkgs/development/compilers/gcc/5/default.nix
+++ b/pkgs/development/compilers/gcc/5/default.nix
@@ -336,7 +336,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix
index bc408e28f589..25940420e9a9 100644
--- a/pkgs/development/compilers/gcc/6/default.nix
+++ b/pkgs/development/compilers/gcc/6/default.nix
@@ -328,7 +328,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix
index 78b499f096da..87d5c751e859 100644
--- a/pkgs/development/compilers/gcc/7/default.nix
+++ b/pkgs/development/compilers/gcc/7/default.nix
@@ -330,7 +330,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/compilers/gcc/snapshot/default.nix b/pkgs/development/compilers/gcc/snapshot/default.nix
index c7f7b9d970a2..46fcc53b3c46 100644
--- a/pkgs/development/compilers/gcc/snapshot/default.nix
+++ b/pkgs/development/compilers/gcc/snapshot/default.nix
@@ -317,7 +317,7 @@ stdenv.mkDerivation ({
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index a528cb0bba93..549503f0013f 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
   # TODO(@Ericson2314): Always pass "--target" and always prefix.
   configurePlatforms =
     # TODO(@Ericson2314): Figure out what's going wrong with Arm
-    if hostPlatform == targetPlatform && targetPlatform.isArm32
+    if hostPlatform == targetPlatform && targetPlatform.isArm
     then []
     else [ "build" "host" ] ++ stdenv.lib.optional (targetPlatform != hostPlatform) "target";
 
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 17bf1f8b428c..31de28fdc0c2 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -104,9 +104,7 @@ let
       # Utility flags to test the type of platform.
       inherit (hostPlatform)
         isDarwin isLinux isSunOS isHurd isCygwin isFreeBSD isOpenBSD
-        isi686 isx86_64 is64bit isMips isBigEndian;
-      isArm = hostPlatform.isArm32;
-      isAarch64 = hostPlatform.isArm64;
+        isi686 isx86_64 is64bit isArm isAarch64 isMips isBigEndian;
 
       # Whether we should run paxctl to pax-mark binaries.
       needsPax = isLinux;

From 8137a8cb73833432e8da8281663b56ac01d3ba0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 24 Aug 2017 10:57:50 +0200
Subject: [PATCH 17/75] gawk: refactor

- Don't build with libsigsegv by default.  The build apparently attempted
  to link against it, but it never retained the reference anyway...
- Side effect: stdenv bootstrapping needs no libsigsegv anymore.
- Run checks, but only in the interactive gawk by default on Linux,
  so that stdenv bootstrap isn't slowed down (by glibc locales, etc.).
- xz should be no longer needed in inputs, as we have it in stdenvs now.

The whole change was triggered by some used kernel versions still
breaking libsigsegv tests #28464.
---
 pkgs/stdenv/linux/default.nix    |  5 ++-
 pkgs/tools/text/gawk/default.nix | 62 ++++++++++++++++++--------------
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 5c03d83d5f7b..48deb9a5c02c 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -303,7 +303,10 @@ in
             gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl
           ]
         # Library dependencies
-        ++ map getLib [ attr acl zlib pcre libsigsegv ]
+        ++ map getLib (
+            [ attr acl zlib pcre ]
+            ++ lib.optional (gawk.libsigsegv != null) gawk.libsigsegv
+          )
         # More complicated cases
         ++ [
             glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
diff --git a/pkgs/tools/text/gawk/default.nix b/pkgs/tools/text/gawk/default.nix
index dec7af045251..415a2ade28db 100644
--- a/pkgs/tools/text/gawk/default.nix
+++ b/pkgs/tools/text/gawk/default.nix
@@ -1,5 +1,19 @@
-{ stdenv, fetchurl, xz, libsigsegv, readline, interactive ? false
-, locale ? null }:
+{ stdenv, fetchurl
+# TODO: links -lsigsegv but loses the reference for some reason
+, withSigsegv ? (false && stdenv.system != "x86_64-cygwin"), libsigsegv
+, interactive ? false, readline
+
+/* Test suite broke on:
+       stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
+    || stdenv.isDarwin # XXX: `locale' segfaults
+    || stdenv.isSunOS  # XXX: `_backsmalls1' fails, locale stuff?
+    || stdenv.isFreeBSD
+*/
+, doCheck ? (interactive && stdenv.isLinux), glibcLocales ? null
+, locale ? null
+}:
+
+assert (doCheck && stdenv.isLinux) -> glibcLocales != null;
 
 let
   inherit (stdenv.lib) optional;
@@ -13,36 +27,30 @@ stdenv.mkDerivation rec {
   };
 
   # When we do build separate interactive version, it makes sense to always include man.
-  outputs = [ "out" "info" ] ++ stdenv.lib.optional (!interactive) "man";
+  outputs = [ "out" "info" ] ++ optional (!interactive) "man";
 
-  # FIXME: 4.1.4 testsuite breaks when only C locales are available
-  doCheck = false /*!(
-       stdenv.isCygwin # XXX: `test-dup2' segfaults on Cygwin 6.1
-    || stdenv.isDarwin # XXX: `locale' segfaults
-    || stdenv.isSunOS  # XXX: `_backsmalls1' fails, locale stuff?
-    || stdenv.isFreeBSD
-  )*/;
+  nativeBuildInputs = optional (doCheck && stdenv.isLinux) glibcLocales;
 
-  nativeBuildInputs = [ xz.bin ];
   buildInputs =
-       stdenv.lib.optional (stdenv.system != "x86_64-cygwin") libsigsegv
-    ++ stdenv.lib.optional interactive readline
-    ++ stdenv.lib.optional stdenv.isDarwin locale;
+       optional withSigsegv libsigsegv
+    ++ optional interactive readline
+    ++ optional stdenv.isDarwin locale;
 
-  configureFlags = stdenv.lib.optional (stdenv.system != "x86_64-cygwin") "--with-libsigsegv-prefix=${libsigsegv}"
-    ++ [(if interactive then "--with-readline=${readline.dev}" else "--without-readline")];
+  configureFlags = [
+    (if withSigsegv then "--with-libsigsegv-prefix=${libsigsegv}" else "--without-libsigsegv")
+    (if interactive then "--with-readline=${readline.dev}" else "--without-readline")
+  ];
 
-  postInstall =
-    if interactive then
-      ''
-        rm "$out"/bin/gawk-*
-        ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
-      ''
-    else # TODO: remove this other branch on a stdenv rebuild
-      ''
-        rm $out/bin/gawk-*
-        ln -s $man/share/man/man1/gawk.1 $man/share/man/man1/awk.1
-      '';
+  inherit doCheck;
+
+  postInstall = ''
+    rm "$out"/bin/gawk-*
+    ln -s gawk.1 "''${!outputMan}"/share/man/man1/awk.1
+  '';
+
+  passthru = {
+    libsigsegv = if withSigsegv then libsigsegv else null; # for stdenv bootstrap
+  };
 
   meta = with stdenv.lib; {
     homepage = http://www.gnu.org/software/gawk/;

From 5674da5aed5edcab01378a506707fb78574c5b75 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 24 Aug 2017 14:43:57 +0300
Subject: [PATCH 18/75] Fix "treewide: Consistently call ARM 'arm'"

0c0fad6141cf3d62 was broken. I didn't realize there's some hidden
metaprogramming code where one can't even grep for 'isFoo' to find its
definition :(
---
 lib/systems/inspect.nix | 4 +---
 lib/systems/parse.nix   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index a81e88989c0a..2d5353341f58 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -11,6 +11,7 @@ rec {
     PowerPC      = { cpu = cpuTypes.powerpc; };
     x86          = { cpu = { family = "x86"; }; };
     Arm          = { cpu = { family = "arm"; }; };
+    Aarch64      = { cpu = { family = "aarch64"; }; };
     Mips         = { cpu = { family = "mips"; }; };
     BigEndian    = { cpu = { significantByte = significantBytes.bigEndian; }; };
     LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
@@ -28,9 +29,6 @@ rec {
     Windows      = { kernel = kernels.windows; };
     Cygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
     MinGW        = { kernel = kernels.windows; abi = abis.gnu; };
-
-    Arm32        = recursiveUpdate Arm patterns."32bit";
-    Arm64        = recursiveUpdate Arm patterns."64bit";
   };
 
   matchAnyAttrs = patterns:
diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index befe90f9abeb..438d83685db4 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -40,7 +40,7 @@ rec {
     armv6l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7a   = { bits = 32; significantByte = littleEndian; family = "arm"; };
     armv7l   = { bits = 32; significantByte = littleEndian; family = "arm"; };
-    aarch64  = { bits = 64; significantByte = littleEndian; family = "arm"; };
+    aarch64  = { bits = 64; significantByte = littleEndian; family = "aarch64"; };
     i686     = { bits = 32; significantByte = littleEndian; family = "x86"; };
     x86_64   = { bits = 64; significantByte = littleEndian; family = "x86"; };
     mips64el = { bits = 32; significantByte = littleEndian; family = "mips"; };

From 791ce593ce065cf074edf1509ff52ebc69136d9e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 9 Jul 2017 15:12:32 -0400
Subject: [PATCH 19/75] linux-headers: Improve derivation, removing cross arg

 - Perl is used at build time, so must be in `nativeBuildInputs`. It's
   not used at run time so it should not be in `buildInputs`, too.

 - Don't treat headers like a compiler---use the build and host
   platforms not host and target. Perhaps that would make sense if every
   library's headers could be a separate derivation, but since that is
   not feasible, best to keep the implementation and interface in the
   same stage.

   To do this, we used `stdenvNoCC` to get rid of the normal toolchain,
   and added a dependency for the toolchain targeting the build platform
   --- `buildPackages.stdenv.cc` --- thus everything is effectively slid
   a stage black.
---
 pkgs/os-specific/linux/kernel-headers/4.4.nix | 44 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  5 +--
 2 files changed, 20 insertions(+), 29 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel-headers/4.4.nix b/pkgs/os-specific/linux/kernel-headers/4.4.nix
index be6dd8472012..716ad799bc64 100644
--- a/pkgs/os-specific/linux/kernel-headers/4.4.nix
+++ b/pkgs/os-specific/linux/kernel-headers/4.4.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchurl, perl, cross ? null }:
+{ stdenvNoCC, lib, buildPackages
+, buildPlatform, hostPlatform
+, fetchurl, perl
+}:
 
-assert cross == null -> stdenv.isLinux;
+assert hostPlatform.isLinux;
 
 let
-
   version = "4.4.10";
-
-  kernelHeadersBaseConfig =
-    if cross == null
-    then stdenv.platform.kernelHeadersBaseConfig
-    else cross.platform.kernelHeadersBaseConfig;
-
+  inherit (hostPlatform.platform) kernelHeadersBaseConfig;
 in
 
-stdenv.mkDerivation {
+stdenvNoCC.mkDerivation {
   name = "linux-headers-${version}";
 
   src = fetchurl {
@@ -21,23 +18,20 @@ stdenv.mkDerivation {
     sha256 = "1kpjvvd9q9wwr3314q5ymvxii4dv2d27295bzly225wlc552xhja";
   };
 
-  targetConfig = if cross != null then cross.config else null;
+  targetConfig = if hostPlatform != buildPlatform then hostPlatform.config else null;
 
-  platform =
-    if cross != null then cross.platform.kernelArch else
-    if stdenv.system == "i686-linux" then "i386" else
-    if stdenv.system == "x86_64-linux" then "x86_64" else
-    if stdenv.system == "powerpc-linux" then "powerpc" else
-    if stdenv.isArm then "arm" else
-    if stdenv.platform ? kernelArch then stdenv.platform.kernelArch else
-    abort "don't know what the kernel include directory is called for this platform";
+  platform = hostPlatform.platform.kernelArch or (
+    if hostPlatform.system == "i686-linux" then "i386" else
+    if hostPlatform.system == "x86_64-linux" then "x86_64" else
+    if hostPlatform.system == "powerpc-linux" then "powerpc" else
+    if hostPlatform.isArm then "arm" else
+    abort "don't know what the kernel include directory is called for this platform");
 
-  buildInputs = [perl];
+  # It may look odd that we use `stdenvNoCC`, and yet explicit depend on a cc.
+  # We do this so we have a build->build, not build->host, C compiler.
+  nativeBuildInputs = [ buildPackages.stdenv.cc perl ];
 
-  extraIncludeDirs =
-    if cross != null then
-        (if cross.arch == "powerpc" then ["ppc"] else [])
-    else if stdenv.system == "powerpc-linux" then ["ppc"] else [];
+  extraIncludeDirs = lib.optional hostPlatform.isPowerPC ["ppc"];
 
   buildPhase = ''
     if test -n "$targetConfig"; then
@@ -63,7 +57,7 @@ stdenv.mkDerivation {
     fi
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Header files and scripts for Linux kernel";
     license = licenses.gpl2;
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5809c436dbbc..77543077c067 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12021,9 +12021,7 @@ with pkgs;
 
   lkl = callPackage ../applications/virtualization/lkl { };
 
-  linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix {
-    cross = if targetPlatform != hostPlatform then targetPlatform else null;
-  };
+  linuxHeaders_4_4 = callPackage ../os-specific/linux/kernel-headers/4.4.nix { };
   linuxHeaders = linuxHeaders_4_4;
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
@@ -12666,7 +12664,6 @@ with pkgs;
   uclibc = callPackage ../os-specific/linux/uclibc { };
 
   uclibcCross = lowPrio (callPackage ../os-specific/linux/uclibc {
-    inherit (buildPackages) linuxHeaders;
     gccCross = gccCrossStageStatic;
     cross = assert targetPlatform != buildPlatform; targetPlatform;
   });

From f2cdc1e5c25504e6407eb84dc492a2b71fd3a0a8 Mon Sep 17 00:00:00 2001
From: Albert Peschar <albert@peschar.net>
Date: Tue, 15 Aug 2017 10:02:16 +0200
Subject: [PATCH 20/75] twisted: update to 17.5.0

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

diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix
index 6898863e8afc..66a6022802fb 100644
--- a/pkgs/development/python-modules/twisted/default.nix
+++ b/pkgs/development/python-modules/twisted/default.nix
@@ -1,17 +1,17 @@
 { stdenv, buildPythonPackage, fetchurl, python,
-  zope_interface, incremental, automat, constantly
+  zope_interface, incremental, automat, constantly, hyperlink
 }:
 buildPythonPackage rec {
   pname = "Twisted";
   name = "${pname}-${version}";
-  version = "17.1.0";
+  version = "17.5.0";
 
   src = fetchurl {
     url = "mirror://pypi/T/Twisted/${name}.tar.bz2";
-    sha256 = "1p245mg15hkxp7hy5cyq2fgvlgjkb4cg0gwkwd148nzy1bbi3wnv";
+    sha256 = "1sh2h23nnizcdyrl2rn7zxijglikxwz7z7grqpvq496zy2aa967i";
   };
 
-  propagatedBuildInputs = [ zope_interface incremental automat constantly ];
+  propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink ];
 
   # Patch t.p._inotify to point to libc. Without this,
   # twisted.python.runtime.platform.supportsINotify() == False

From fb4357445665ab12877cbc49027f7593b471b288 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 19:06:43 +0200
Subject: [PATCH 21/75] python.pkgs.obfsproxy: fix build

---
 pkgs/top-level/python-packages.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2c52732be98f..f3ed5f898327 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14587,13 +14587,17 @@ in {
       sha256 = "04ja1cl8xzqnwrd2gi6nlnxbmjri141bzwa5gybvr44d8h3k2nfa";
     };
 
-    patchPhase = ''
+    postPatch = ''
       substituteInPlace setup.py --replace "version=versioneer.get_version()" "version='${version}'"
+      substituteInPlace setup.py --replace "argparse" ""
     '';
 
     propagatedBuildInputs = with self;
       [ pyptlib argparse twisted pycrypto pyyaml ];
 
+    # No tests in archive
+    doCheck = false;
+
     meta = {
       description = "A pluggable transport proxy";
       homepage = https://www.torproject.org/projects/obfsproxy;

From 0eb868fa8aedb58e3bedb2b41a754a3460fab252 Mon Sep 17 00:00:00 2001
From: WilliButz <wbutz@cyberfnord.de>
Date: Wed, 23 Aug 2017 14:41:01 +0200
Subject: [PATCH 22/75] pango: fix pango_default_break function

bug: https://bugzilla.gnome.org/show_bug.cgi?id=785978#c9

(fixes the failing perl-gtk2 tests)
---
 pkgs/development/libraries/pango/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pango/default.nix b/pkgs/development/libraries/pango/default.nix
index 29a69bee0c70..ecb0dd841fc8 100644
--- a/pkgs/development/libraries/pango/default.nix
+++ b/pkgs/development/libraries/pango/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libXft, cairo, harfbuzz
+{ stdenv, fetchurl, fetchpatch, pkgconfig, libXft, cairo, harfbuzz
 , libintlOrEmpty, gobjectIntrospection, darwin
 }:
 
@@ -16,6 +16,15 @@ stdenv.mkDerivation rec {
     sha256 = "9faea6535312fe4436b93047cf7a04af544eb52a079179bd3a33821aacce7e16";
   };
 
+  patches = [
+    # https://bugzilla.gnome.org/show_bug.cgi?id=785978#c9
+    (fetchpatch rec {
+      name = "pango-fix-gtk2-test-failures.patch";
+      url = "https://bug785978.bugzilla-attachments.gnome.org/attachment.cgi?id=357690&action=diff&collapsed=&context=patch&format=raw&headers=1";
+      sha256 = "055m2dllfr5pgw6bci72snw38f4hsyw1x7flj188c965ild8lq3a";
+    })
+  ];
+
   outputs = [ "bin" "dev" "out" "devdoc" ];
 
   buildInputs = [ gobjectIntrospection ];

From 287fce6402100c40317233de6b4f749f2b79b0a5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 16:23:30 -0400
Subject: [PATCH 23/75] expand-response-params: Pull out of cc-wrapper

No hashes were changed
---
 pkgs/build-support/cc-wrapper/default.nix        | 16 ++++------------
 .../expand-response-params/default.nix           | 13 +++++++++++++
 .../expand-response-params.c                     |  0
 3 files changed, 17 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/build-support/expand-response-params/default.nix
 rename pkgs/build-support/{cc-wrapper => expand-response-params}/expand-response-params.c (100%)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 525cb07ac32a..d5ae64c9c5ff 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -74,18 +74,10 @@ let
     else if stdenv.lib.hasSuffix "pc-gnu" targetPlatform.config then "ld.so.1"
     else null;
 
-  expand-response-params = if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
-  then buildPackages.stdenv.mkDerivation {
-    name = "expand-response-params";
-    src = ./expand-response-params.c;
-    buildCommand = ''
-      # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
-      cp "$src" expand-response-params.c
-      "$CC" -std=c99 -O3 -o "$out" expand-response-params.c
-      strip -S $out
-      ${optionalString hostPlatform.isLinux "patchelf --shrink-rpath $out"}
-    '';
-  } else "";
+  expand-response-params =
+    if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"
+    then import ../expand-response-params { inherit (buildPackages) stdenv; }
+    else "";
 
 in
 
diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix
new file mode 100644
index 000000000000..7afbb727fc3e
--- /dev/null
+++ b/pkgs/build-support/expand-response-params/default.nix
@@ -0,0 +1,13 @@
+{ stdenv }:
+
+stdenv.mkDerivation {
+  name = "expand-response-params";
+  src = ./expand-response-params.c;
+  buildCommand = ''
+    # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
+    cp "$src" expand-response-params.c
+    "$CC" -std=c99 -O3 -o "$out" expand-response-params.c
+    strip -S $out
+    ${stdenv.lib.optionalString stdenv.hostPlatform.isLinux "patchelf --shrink-rpath $out"}
+  '';
+}
diff --git a/pkgs/build-support/cc-wrapper/expand-response-params.c b/pkgs/build-support/expand-response-params/expand-response-params.c
similarity index 100%
rename from pkgs/build-support/cc-wrapper/expand-response-params.c
rename to pkgs/build-support/expand-response-params/expand-response-params.c

From d58e1f1c7b3e955d3ee1194ea96c574338b47b97 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 19:34:20 +0200
Subject: [PATCH 24/75] python.pkgs: many updates

---
 pkgs/development/python-modules/Cython/default.nix  |  4 ++--
 .../development/python-modules/aafigure/default.nix |  4 ++--
 pkgs/development/python-modules/adal/default.nix    |  4 ++--
 pkgs/development/python-modules/aiodns/default.nix  |  4 ++--
 pkgs/development/python-modules/alembic/default.nix |  4 ++--
 .../python-modules/argcomplete/default.nix          |  4 ++--
 .../development/python-modules/asgi_ipc/default.nix |  4 ++--
 pkgs/development/python-modules/astropy/default.nix |  4 ++--
 .../python-modules/async_timeout/default.nix        |  4 ++--
 .../python-modules/audioread/default.nix            |  4 ++--
 .../development/python-modules/autobahn/default.nix |  4 ++--
 .../python-modules/bottleneck/default.nix           |  4 ++--
 pkgs/development/python-modules/breathe/default.nix |  4 ++--
 pkgs/development/python-modules/certifi/default.nix |  4 ++--
 pkgs/development/python-modules/chai/default.nix    |  4 ++--
 .../python-modules/confluent-kafka/default.nix      |  4 ++--
 .../python-modules/coveralls/default.nix            |  4 ++--
 .../python-modules/discordpy/default.nix            |  4 ++--
 .../python-modules/django-polymorphic/default.nix   |  4 ++--
 .../python-modules/django_compressor/default.nix    |  4 ++--
 .../python-modules/djangorestframework/default.nix  |  4 ++--
 pkgs/development/python-modules/docker.nix          |  4 ++--
 pkgs/development/python-modules/dulwich.nix         |  4 ++--
 pkgs/development/python-modules/emcee/default.nix   |  4 ++--
 pkgs/development/python-modules/flake8/default.nix  |  4 ++--
 .../python-modules/flask-migrate/default.nix        |  4 ++--
 pkgs/development/python-modules/flask-testing.nix   | 12 +++++++-----
 .../python-modules/fonttools/default.nix            |  4 ++--
 pkgs/development/python-modules/ftfy/default.nix    |  4 ++--
 pkgs/development/python-modules/gensim/default.nix  |  4 ++--
 .../python-modules/html5-parser/default.nix         |  4 ++--
 .../python-modules/ipywidgets/default.nix           |  4 ++--
 pkgs/development/python-modules/keras/default.nix   |  4 ++--
 .../python-modules/keystoneauth1/default.nix        |  4 ++--
 pkgs/development/python-modules/kitchen/default.nix |  4 ++--
 .../python-modules/ledgerblue/default.nix           |  4 ++--
 pkgs/development/python-modules/libtmux/default.nix |  4 ++--
 .../development/python-modules/llvmlite/default.nix |  4 ++--
 pkgs/development/python-modules/m2r/default.nix     |  4 ++--
 .../python-modules/magic-wormhole/default.nix       |  4 ++--
 .../python-modules/marionette-harness/default.nix   |  4 ++--
 .../python-modules/multidict/default.nix            |  4 ++--
 pkgs/development/python-modules/natsort/default.nix |  4 ++--
 .../development/python-modules/nbformat/default.nix |  4 ++--
 pkgs/development/python-modules/numba/default.nix   |  4 ++--
 .../python-modules/oslo-config/default.nix          |  4 ++--
 pkgs/development/python-modules/pbr/default.nix     |  4 ++--
 .../python-modules/phonenumbers/default.nix         |  4 ++--
 pkgs/development/python-modules/plotly/default.nix  |  4 ++--
 pkgs/development/python-modules/pycuda/default.nix  |  4 ++--
 .../python-modules/pygraphviz/default.nix           |  4 ++--
 pkgs/development/python-modules/pylast/default.nix  |  4 ++--
 .../development/python-modules/pyopencl/default.nix |  4 ++--
 .../development/python-modules/pypandoc/default.nix |  4 ++--
 .../development/python-modules/pyroute2/default.nix |  4 ++--
 pkgs/development/python-modules/pyscard/default.nix |  4 ++--
 .../python-modules/pytest-asyncio/default.nix       |  4 ++--
 .../python-modules/pytest-xdist/default.nix         |  8 ++++----
 pkgs/development/python-modules/pytest/default.nix  | 10 ++++++----
 .../python-modules/python-editor/default.nix        |  4 ++--
 .../python-modules/qtconsole/default.nix            |  4 ++--
 .../python-modules/relatorio/default.nix            |  4 ++--
 .../python-modules/requests-oauthlib.nix            |  6 +++---
 pkgs/development/python-modules/rfc3986/default.nix |  4 ++--
 pkgs/development/python-modules/semver/default.nix  |  4 ++--
 .../python-modules/setuptools/default.nix           |  4 ++--
 .../python-modules/simplejson/default.nix           |  4 ++--
 pkgs/development/python-modules/sphinx/default.nix  | 13 ++++++++++---
 .../python-modules/sqlalchemy/default.nix           |  4 ++--
 .../python-modules/stevedore/default.nix            |  4 ++--
 pkgs/development/python-modules/stripe/default.nix  |  4 ++--
 pkgs/development/python-modules/tqdm/default.nix    |  4 ++--
 pkgs/development/python-modules/treq/default.nix    |  4 ++--
 pkgs/development/python-modules/txaio/default.nix   |  4 ++--
 pkgs/development/python-modules/vega/default.nix    |  4 ++--
 .../python-modules/virtualenv/default.nix           |  4 ++--
 .../python-modules/websockets/default.nix           |  4 ++--
 .../python-modules/widgetsnbextension/default.nix   |  4 ++--
 pkgs/development/python-modules/xlwt/default.nix    |  4 ++--
 .../development/python-modules/yamllint/default.nix |  4 ++--
 pkgs/development/python-modules/yapf/default.nix    |  4 ++--
 pkgs/development/python-modules/yarl/default.nix    |  4 ++--
 pkgs/development/python-modules/zeep/default.nix    |  4 ++--
 83 files changed, 186 insertions(+), 175 deletions(-)

diff --git a/pkgs/development/python-modules/Cython/default.nix b/pkgs/development/python-modules/Cython/default.nix
index 9d09b93ed20b..3dd4b0acbafb 100644
--- a/pkgs/development/python-modules/Cython/default.nix
+++ b/pkgs/development/python-modules/Cython/default.nix
@@ -14,11 +14,11 @@
 buildPythonPackage rec {
   pname = "Cython";
   name = "${pname}-${version}";
-  version = "0.25.2";
+  version = "0.26";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "01h3lrf6d98j07iakifi81qjszh6faa37ibx7ylva1vsqbwx2hgi";
+    sha256 = "4c24e2c22ddaed624d35229dc5db25049e9e225c6f64f3364326836cad8f2c66";
   };
 
   # With Python 2.x on i686-linux or 32-bit ARM this test fails because the
diff --git a/pkgs/development/python-modules/aafigure/default.nix b/pkgs/development/python-modules/aafigure/default.nix
index 1084eca762be..120d17e6709b 100644
--- a/pkgs/development/python-modules/aafigure/default.nix
+++ b/pkgs/development/python-modules/aafigure/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "aafigure";
-  version = "0.5";
+  version = "0.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "090c88beb091d28a233f854e239713aa15d8d1906ea16211855345c912e8a091";
+    sha256 = "49f2c1fd2b579c1fffbac1386a2670b3f6f475cc7ff6cc04d8b984888c2d9e1e";
   };
 
   propagatedBuildInputs = [ pillow ];
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index 982e63882ad3..22ed76b9e59c 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "adal";
-  version = "0.1.0";
+  version = "0.4.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1f32k18ck54adqlgvh6fjhy4yavcyrwy813prjyqppqqq4bn1a09";
+    sha256 = "7c5bbf4d8a17d535e6e857b28a41cedddc2767fc57424c15d484fa779bb97325";
   };
 
   propagatedBuildInputs =  [ requests pyjwt ];
diff --git a/pkgs/development/python-modules/aiodns/default.nix b/pkgs/development/python-modules/aiodns/default.nix
index 4265a7488f66..becb9ceae725 100644
--- a/pkgs/development/python-modules/aiodns/default.nix
+++ b/pkgs/development/python-modules/aiodns/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "aiodns";
-  version = "1.0.1";
+  version = "1.1.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d";
+    sha256 = "d8677adc679ce8d0ef706c14d9c3d2f27a0e0cc11d59730cdbaf218ad52dd9ea";
   };
 
   propagatedBuildInputs = with stdenv.lib; [ pycares ] 
diff --git a/pkgs/development/python-modules/alembic/default.nix b/pkgs/development/python-modules/alembic/default.nix
index d1262d8fab45..45bea1fe687a 100644
--- a/pkgs/development/python-modules/alembic/default.nix
+++ b/pkgs/development/python-modules/alembic/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "alembic";
-  version = "0.9.3";
+  version = "0.9.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "57f2ede554c0b18f1cf811cfbb3b02c586a5422df94922e3821883ba0b8c616c";
+    sha256 = "8bdcb4babaa16b9a826f8084949cc2665cb328ecf7b89b3224b0ab85bd16fd05";
   };
 
   buildInputs = [ pytest pytestcov mock coverage ];
diff --git a/pkgs/development/python-modules/argcomplete/default.nix b/pkgs/development/python-modules/argcomplete/default.nix
index 228ffa7e5217..a4318fe5fa45 100644
--- a/pkgs/development/python-modules/argcomplete/default.nix
+++ b/pkgs/development/python-modules/argcomplete/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "argcomplete";
-  version = "1.8.2";
+  version = "1.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0sslhl1klvh92c8hjsz3y3mmnpcqspcgi49g5cik2rpbfkhcsb3s";
+    sha256 = "d6ea272a93bb0387f758def836e73c36fff0c54170258c212de3e84f7db8d5ed";
   };
 
   doCheck = false; # bash-completion test fails with "compgen: command not found".
diff --git a/pkgs/development/python-modules/asgi_ipc/default.nix b/pkgs/development/python-modules/asgi_ipc/default.nix
index e282294ef0cc..41de61dbccae 100644
--- a/pkgs/development/python-modules/asgi_ipc/default.nix
+++ b/pkgs/development/python-modules/asgi_ipc/default.nix
@@ -2,13 +2,13 @@
   asgiref, msgpack, posix_ipc
 }:
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.4.1";
   pname = "asgi_ipc";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_ipc/${name}.tar.gz";
-    sha256 = "1bae453d771eb92c0ec558b826fc0bce75a2a61bf21187784d4e4dc11710e588";
+    sha256 = "87cc9dda476d28f335261b73f0f3070f28847718de2e64da9a80492638203e43";
   };
 
   propagatedBuildInputs = [ asgiref msgpack posix_ipc ];
diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index 836ce3addea0..44ff96cf826f 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -9,13 +9,13 @@
 buildPythonPackage rec {
   
   pname = "astropy";
-  version = "1.3.3";
+  version = "2.0.1";
 
   name = "${pname}-${version}";
   doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook.
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ed093e033fcbee5a3ec122420c3376f8a80f74663214560727d3defe82170a99";
+    sha256 = "25e0881a392a2e03b4a705cf9592f01894d23f64797323b21387efa8ea9ec03e";
   };
   propagatedBuildInputs = [ numpy cython h5py scipy ];
 
diff --git a/pkgs/development/python-modules/async_timeout/default.nix b/pkgs/development/python-modules/async_timeout/default.nix
index aa548602d372..94c2379b0e15 100644
--- a/pkgs/development/python-modules/async_timeout/default.nix
+++ b/pkgs/development/python-modules/async_timeout/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname = "async-timeout";
-  version = "1.2.1";
+  version = "1.3.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "380e9bfd4c009a14931ffe487499b0906b00b3378bb743542cfd9fbb6d8e4657";
+    sha256 = "f4651f122a9877049930ce31a8422bc202a47937627295fe5e411b2c2083481f";
   };
 
   buildInputs = [ pytestrunner ];
diff --git a/pkgs/development/python-modules/audioread/default.nix b/pkgs/development/python-modules/audioread/default.nix
index bf71cf8cfbdd..88fdcbbeba17 100644
--- a/pkgs/development/python-modules/audioread/default.nix
+++ b/pkgs/development/python-modules/audioread/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   pname = "audioread";
   name = "${pname}-${version}";
-  version = "2.1.1";
+  version = "2.1.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e";
+    sha256 = "36c3b118f097c58ba073b7d040c4319eff200756f094295677567e256282d0d7";
   };
 
   # No tests, need to disable or py3k breaks
diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix
index b83d731c720a..8d647a9b52eb 100644
--- a/pkgs/development/python-modules/autobahn/default.nix
+++ b/pkgs/development/python-modules/autobahn/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "autobahn";
-  version = "17.5.1";
+  version = "17.8.1";
 
   src = fetchurl {
     url = "mirror://pypi/a/${pname}/${name}.tar.gz";
-    sha256 = "0p2xx20g0rj6pnp4h3231mn8zk4ag8msv69f93gai2hzl5vglcia";
+    sha256 = "72b1b1e30bd41d52e7454ef6fe78fe80ebf2341a747616e2cd854a76203a0ec4";
   };
 
   # Upstream claim python2 support, but tests require pytest-asyncio which
diff --git a/pkgs/development/python-modules/bottleneck/default.nix b/pkgs/development/python-modules/bottleneck/default.nix
index 2c1850b86abc..4eb5bcb6edc9 100644
--- a/pkgs/development/python-modules/bottleneck/default.nix
+++ b/pkgs/development/python-modules/bottleneck/default.nix
@@ -9,10 +9,10 @@
 buildPythonPackage rec {
   pname = "Bottleneck";
   name = "Bottleneck-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3bec84564a4adbe97c24e875749b949a19cfba4e4588be495cc441db7c6b05e8";
+    sha256 = "6efcde5f830aed64feafca0359b51db0e184c72af8ba6675b4a99f263922eb36";
   };
 
   checkInputs = [ nose ];
diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix
index 9f4d89da90c0..6f539f15222c 100644
--- a/pkgs/development/python-modules/breathe/default.nix
+++ b/pkgs/development/python-modules/breathe/default.nix
@@ -1,13 +1,13 @@
 { lib, fetchurl, buildPythonPackage, docutils, six, sphinx, isPy3k }:
 
 buildPythonPackage rec {
-  version = "4.6.0";
+  version = "4.7.2";
   pname = "breathe";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/b/breathe/${name}.tar.gz";
-    sha256 = "9db2ba770f824da323b9ea3db0b98d613a4e0af094c82ccb0a82991da81b736a";
+    sha256 = "dd15efc66d65180e4c994edd15fcb642812ad04ac9c36738b28bf248d7c0be32";
   };
 
   propagatedBuildInputs = [ docutils six sphinx ];
diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix
index a2cf4633d302..79eea0574546 100644
--- a/pkgs/development/python-modules/certifi/default.nix
+++ b/pkgs/development/python-modules/certifi/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "certifi";
-  version = "2017.4.17";
+  version = "2017.7.27.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f7527ebf7461582ce95f7a9e03dd141ce810d40590834f4ec20cddd54234c10a";
+    sha256 = "40523d2efb60523e113b44602298f0960e900388cf3bb6043f645cf57ea9e3f5";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/chai/default.nix b/pkgs/development/python-modules/chai/default.nix
index f5440004ebdb..aa4e5e47e728 100644
--- a/pkgs/development/python-modules/chai/default.nix
+++ b/pkgs/development/python-modules/chai/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "chai";
-  version = "1.1.1";
+  version = "1.1.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "016kf3irrclpkpvcm7q0gmkfibq7jgy30a9v73pp42bq9h9a32bl";
+    sha256 = "ff8d2b6855f660cd23cd5ec79bd10264d39f24f6235773331b48e7fcd637d6cc";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix
index d26008231b08..c8cbfe9d9be1 100644
--- a/pkgs/development/python-modules/confluent-kafka/default.nix
+++ b/pkgs/development/python-modules/confluent-kafka/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
-  version = "0.9.4";
+  version = "0.11.0";
   pname = "confluent-kafka";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1v8apw9f8l01ql42jg1sfqv41yxvcbxn1a3ar01y0ni428swq6wk";
+    sha256 = "4c34bfe8f823ee3777d93820ec6578365d2bde3cd1302cbd0e44c86b68643667";
   };
 
   buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ avro ]) ;
diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix
index 57431c2c2c25..f3b01c668159 100644
--- a/pkgs/development/python-modules/coveralls/default.nix
+++ b/pkgs/development/python-modules/coveralls/default.nix
@@ -13,12 +13,12 @@
 buildPythonPackage rec {
   pname = "coveralls";
   name = "${pname}-python-${version}";
-  version = "1.1";
+  version = "1.2.0";
 
   # wanted by tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0238hgdwbvriqxrj22zwh0rbxnhh9c6hh75i39ll631vq62h65il";
+    sha256 = "510682001517bcca1def9f6252df6ce730fcb9831c62d9fff7c7d55b6fdabdf3";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/discordpy/default.nix b/pkgs/development/python-modules/discordpy/default.nix
index 53a4a51fcd87..eebcd802dd61 100644
--- a/pkgs/development/python-modules/discordpy/default.nix
+++ b/pkgs/development/python-modules/discordpy/default.nix
@@ -11,13 +11,13 @@
 
 let
   pname = "discord.py";
-  version = "0.16.8";
+  version = "0.16.10";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "d775b701383e3a5762accf3816b819f357f299476701615ac30c7715a5ea79aa";
+    sha256 = "cb0b9ad5f5edf2d5afd5f5ce07381a0a089eb036004938126a5582fc8fa0cc88";
   };
 
   propagatedBuildInputs = [ asyncio aiohttp websockets pynacl ];
diff --git a/pkgs/development/python-modules/django-polymorphic/default.nix b/pkgs/development/python-modules/django-polymorphic/default.nix
index 83e8f1c4d586..e2fedfdaaf3e 100644
--- a/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/pkgs/development/python-modules/django-polymorphic/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "django-polymorphic";
-  version = "1.2";
+  version = "1.3";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1bz86711sx2b66rl2xz141xppsfmlxilkgjgq0jsavpw37vg7r3r";
+    sha256 = "8737b465ebf5fad772b4c52272189c352f5904f468d298584a3469187e3207ad";
   };
 
   checkInputs = [ django ];
diff --git a/pkgs/development/python-modules/django_compressor/default.nix b/pkgs/development/python-modules/django_compressor/default.nix
index 5d8626ec5760..1fbb4dbafe68 100644
--- a/pkgs/development/python-modules/django_compressor/default.nix
+++ b/pkgs/development/python-modules/django_compressor/default.nix
@@ -2,12 +2,12 @@
   rcssmin, rjsmin, django_appconf }:
 buildPythonPackage rec {
     pname = "django_compressor";
-    version = "2.1.1";
+    version = "2.2";
     name = "${pname}-${version}";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1s42dkq3qp1niaf69markd7m3ljgf2bspyz2nk0sa07f8q04004j";
+      sha256 = "9616570e5b08e92fa9eadc7a1b1b49639cce07ef392fc27c74230ab08075b30f";
     };
 
     # Need to setup django testing
diff --git a/pkgs/development/python-modules/djangorestframework/default.nix b/pkgs/development/python-modules/djangorestframework/default.nix
index 8bbce992c1b0..648ee0196825 100644
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchurl, django }:
 buildPythonPackage rec {
-  version = "3.6.3";
+  version = "3.6.4";
   pname = "djangorestframework";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/djangorestframework/${name}.tar.gz";
-    sha256 = "6aa6aafdfb7f6152a401873ecae93aff9eb54d7a74266065347cf4de68278ae4";
+    sha256 = "de8ac68b3cf6dd41b98e01dcc92dc0022a5958f096eafc181a17fa975d18ca42";
   };
 
   # Test settings are missing
diff --git a/pkgs/development/python-modules/docker.nix b/pkgs/development/python-modules/docker.nix
index 7364c5faed49..88d85dad91aa 100644
--- a/pkgs/development/python-modules/docker.nix
+++ b/pkgs/development/python-modules/docker.nix
@@ -3,13 +3,13 @@
 , ipaddress, backports_ssl_match_hostname, docker_pycreds
 }:
 buildPythonPackage rec {
-  version = "2.4.2";
+  version = "2.5.1";
   pname = "docker";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/docker/${name}.tar.gz";
-    sha256 = "11kl6kl82056bzcycvc2jpz59ra89vwbyzi0yaamixgcm9nzlvr1";
+    sha256 = "b876e6909d8d2360e0540364c3a952a62847137f4674f2439320ede16d6db880";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/dulwich.nix b/pkgs/development/python-modules/dulwich.nix
index 804419d0fca9..bbf43ce615c4 100644
--- a/pkgs/development/python-modules/dulwich.nix
+++ b/pkgs/development/python-modules/dulwich.nix
@@ -3,13 +3,13 @@
 , git, glibcLocales }:
 
 buildPythonPackage rec {
-  version = "0.17.3";
+  version = "0.18.2";
   pname = "dulwich";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/d/dulwich/${name}.tar.gz";
-    sha256 = "0c3eccac93823e172b05d57aaeab3d6f03c6c0f1867613606d1909a3ab4100ca";
+    sha256 = "284d0000b21ac12f94bcd5eb3d7dcc42da51e5506b9a53a11c615b46da906d9b";
   };
 
   LC_ALL = "en_US.UTF-8";
diff --git a/pkgs/development/python-modules/emcee/default.nix b/pkgs/development/python-modules/emcee/default.nix
index 3e95859fc0f8..2afcb2b2de5a 100644
--- a/pkgs/development/python-modules/emcee/default.nix
+++ b/pkgs/development/python-modules/emcee/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "emcee";
-  version = "2.1.0";
+  version = "2.2.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0qyafp9jfya0mkxgqfvljf0rkic5fm8nimzwadyrxyvq7nd07qaw";
+    sha256 = "b83551e342b37311897906b3b8acf32979f4c5542e0a25786ada862d26241172";
   };
 
   propagatedBuildInputs = [ numpy ];
diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix
index aec715328f9b..f7f78e709f92 100644
--- a/pkgs/development/python-modules/flake8/default.nix
+++ b/pkgs/development/python-modules/flake8/default.nix
@@ -6,11 +6,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "flake8";
-  version = "3.3.0";
+  version = "3.4.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "04izn1q1lgbr408l9b3vkxqmpi6mq47bxwc0iwypb02mrxns41xr";
+    sha256 = "c20044779ff848f67f89c56a0e4624c04298cd476e25253ac0c36f910a1a11d8";
   };
 
   buildInputs = [ pytest mock pytestrunner ];
diff --git a/pkgs/development/python-modules/flask-migrate/default.nix b/pkgs/development/python-modules/flask-migrate/default.nix
index 3e2c7ac4602c..dc94be8f6005 100644
--- a/pkgs/development/python-modules/flask-migrate/default.nix
+++ b/pkgs/development/python-modules/flask-migrate/default.nix
@@ -5,12 +5,12 @@ with stdenv.lib;
 
 buildPythonPackage rec {
   pname = "Flask-Migrate";
-  version = "2.0.4";
+  version = "2.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1e6dc83bed93aef9a4791d5daaa03b186c8ef5d96c99c7d88166da683c86e42d";
+    sha256 = "716d5b68eec53821f80b3fbcb0fd60baed0cb0e320abb30289e83217668cef7f";
   };
 
   checkInputs = optional isPy3k glibcLocales;
diff --git a/pkgs/development/python-modules/flask-testing.nix b/pkgs/development/python-modules/flask-testing.nix
index c5fe8f8bdbee..c34c53e3ffa4 100644
--- a/pkgs/development/python-modules/flask-testing.nix
+++ b/pkgs/development/python-modules/flask-testing.nix
@@ -1,14 +1,16 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonOlder
+{ stdenv, fetchPypi, buildPythonPackage, pythonOlder
 , flask, blinker, twill }:
 
 with stdenv.lib;
 
 buildPythonPackage rec {
-  name = "Flask-Testing-0.6.1";
+  pname = "Flask-Testing";
+  version = "0.6.2";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "mirror://pypi/F/Flask-Testing/${name}.tar.gz";
-    sha256 = "1ckmy7kz2qkggdlm9y5wx6gvd2x7qv921dyb059ywfh15hrkkxdb";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f25effd266fce9b16482f4ce3423d5a7d25534aab77bc83caace5d9637bf0df0";
   };
 
   buildInputs = optionals (pythonOlder "3.0") [ twill ];
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index fbe837334041..c037decbc873 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.13.1";
+  version = "3.15.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ded1f9a6cdd6ed19a3df05ae40066d579ffded17369b976f9e701cf31b7b1f2d";
+    sha256 = "8df4b605a28e313f0f9e0a79502caba4150a521347fdbafc063e52fee34912c2";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/ftfy/default.nix b/pkgs/development/python-modules/ftfy/default.nix
index c0aea9877812..e53358677029 100644
--- a/pkgs/development/python-modules/ftfy/default.nix
+++ b/pkgs/development/python-modules/ftfy/default.nix
@@ -9,11 +9,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ftfy";
-  version = "4.4.3";
+  version = "5.1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "152xdb56rhs1q4r0ck1n557sbphw7zq18r75a7kkd159ckdnc01w";        
+    sha256 = "67a29a2fad5f72aec2d8a0a7084e4f499ed040455133ee96b1c458609fc29e78";        
   };
 
   propagatedBuildInputs = [ html5lib wcwidth];
diff --git a/pkgs/development/python-modules/gensim/default.nix b/pkgs/development/python-modules/gensim/default.nix
index 3892ee105c40..837ffa8c8672 100644
--- a/pkgs/development/python-modules/gensim/default.nix
+++ b/pkgs/development/python-modules/gensim/default.nix
@@ -13,10 +13,10 @@
 buildPythonPackage rec {
   pname = "gensim";
   name = "${pname}-${version}";
-  version = "2.1.0";
+  version = "2.3.0";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1wn7bji9b80wn1yggmh7a0dlwzdjr6cp24x4p33j2rf29lxnm2kc";
+    sha256 = "7d0dccc7d2c576e270037949874800b7cfbc86ef081ff981483f612cd18e223f";
   };
 
   propagatedBuildInputs = [ smart_open numpy six scipy
diff --git a/pkgs/development/python-modules/html5-parser/default.nix b/pkgs/development/python-modules/html5-parser/default.nix
index 549dcb89bf7f..6a579cffccf5 100644
--- a/pkgs/development/python-modules/html5-parser/default.nix
+++ b/pkgs/development/python-modules/html5-parser/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "html5-parser";
-  version = "0.4.3";
+  version = "0.4.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "173vzg214x7qfq201m4b09wg5nszdgwjw5q02v23k54iqm3kcpnx";
+    sha256 = "b9f3a1d4cdb8742e8e4ecafab04bff541bde4ff09af233293ed0b94028ec1ab5";
   };
 
   buildInputs = [ pkgconfig ];
diff --git a/pkgs/development/python-modules/ipywidgets/default.nix b/pkgs/development/python-modules/ipywidgets/default.nix
index dcd5b89b6b8e..ce0aed4964d3 100644
--- a/pkgs/development/python-modules/ipywidgets/default.nix
+++ b/pkgs/development/python-modules/ipywidgets/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "ipywidgets";
-  version = "6.0.0";
+  version = "7.0.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "afa6248850cff14ef86117db87aeab0b12237e4eaf740e73716460ed593a43a7";
+    sha256 = "63e454202f72796044e99846881c33767c47fa050735dc1f927657b9cd2b7fcd";
   };
 
   # Tests are not distributed
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index b15b2d0817a1..51c15ad68135 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.0.6";
+  version = "2.0.7";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0519480abe4ad18b2c2d1bc580eab75edd82c95083d341a1157952f4b00019bb";
+    sha256 = "a6c72ee2b94be1ffefe7e77b69582b9827211f0c356b2189459711844d3634c0";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/keystoneauth1/default.nix b/pkgs/development/python-modules/keystoneauth1/default.nix
index c2c2235836f7..17792723e4a3 100644
--- a/pkgs/development/python-modules/keystoneauth1/default.nix
+++ b/pkgs/development/python-modules/keystoneauth1/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "keystoneauth1";
-  version = "1.1.0";
+  version = "3.1.0";
   name = "${pname}-${version}";
   disabled = isPyPy; # a test fails
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "05fc6xsp5mal52ijvj84sf7mrw706ihadfdf5mnq9zxn7pfl4118";
+    sha256 = "e5abfa8bbe866d52ca56afbe528d15214a60033cc1dc9804478cae7424f0f8fb";
   };
 
   buildInputs = [ pbr testtools testresources testrepository mock
diff --git a/pkgs/development/python-modules/kitchen/default.nix b/pkgs/development/python-modules/kitchen/default.nix
index 895cdedcb6e8..a35737e69baf 100644
--- a/pkgs/development/python-modules/kitchen/default.nix
+++ b/pkgs/development/python-modules/kitchen/default.nix
@@ -1,12 +1,12 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 buildPythonPackage rec {
   pname = "kitchen";
-  version = "1.2.4";
+  version = "1.2.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0ggv3p4x8jvmmzhp0xm00h6pvh1g0gmycw71rjwagnrj8n23vxrq";
+    sha256 = "af9fbb60f68cbdb2ead402beb8fa7c7edadbe2aa7b5a70138b7c4b0fa88153fd";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/ledgerblue/default.nix b/pkgs/development/python-modules/ledgerblue/default.nix
index f8faab3fbb81..0bee4dd47b55 100644
--- a/pkgs/development/python-modules/ledgerblue/default.nix
+++ b/pkgs/development/python-modules/ledgerblue/default.nix
@@ -5,11 +5,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "ledgerblue";
-  version = "0.1.13";
+  version = "0.1.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09bsiylvgax6m47w8r0myaf61xj9j0h1spvadx6fx31qy0iqicw0";
+    sha256 = "42cbcd74615576294142d56eb9eaa7e1b67f9dd87eeb24d713336b56e8c01c5c";
   };
 
   buildInputs = [ hidapi pycrypto pillow protobuf future ecpy ];
diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 203b9e6bf754..2f041f0da4a2 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "libtmux";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "111qbgq28za12la5b0aa9rr7hg8235zy0kyzzryn7fa6z3i5k5z8";
+    sha256 = "c7407aa4103d40f50f99432bf4dffe0b4591f976956b2dd7ee7bbf53ad138bd9";
   };
 
   buildInputs = [ pytest_29 ];
diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix
index fa9c6ac18f3a..5de795f84ef9 100644
--- a/pkgs/development/python-modules/llvmlite/default.nix
+++ b/pkgs/development/python-modules/llvmlite/default.nix
@@ -11,13 +11,13 @@
 buildPythonPackage rec {
   pname = "llvmlite";
   name = "${pname}-${version}";
-  version = "0.18.0";
+  version = "0.19.0";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "25a38af925f0523b834b92216d7f7cc997624942d5958287350c254f5e730404";
+    sha256 = "fbaeb3d584e0f6bac82a33776e9b5f0b5b4a3415a03edeff5d66f6176f0edbe2";
   };
 
   propagatedBuildInputs = [ llvm ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34;
diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix
index b79307a8084e..39498919708b 100644
--- a/pkgs/development/python-modules/m2r/default.nix
+++ b/pkgs/development/python-modules/m2r/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   pname = "m2r";
   name = "${pname}-${version}";
-  version = "0.1.7";
+  version = "0.1.10";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "771631d051a52764fe5b660f97ad028df3aff90c9859d345ccfd17a4c7c2ab39";
+    sha256 = "cfb5b8a37defdd594eb46a794b87d9b4ca1902b0e8e309c9f2623f7275c261d6";
   };
 
   propagatedBuildInputs = [ mistune docutils ];
diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index d4a356eaec44..7fedf4d48bbd 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -21,12 +21,12 @@
 
 buildPythonPackage rec {
   pname = "magic-wormhole";
-  version = "0.9.2";
+  version = "0.10.2";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14aed4b453278651d92c3fd8955a105e2d33dcde279fa25d1d759e0e769f16b3";
+    sha256 = "55a423247faee7a0644d25f37760495978cd494ba0274fefd8cd1fad493954ee";
   };
 
   checkInputs = [ mock ];
diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix
index 5b81d3da8ec6..da8949f9f6e4 100644
--- a/pkgs/development/python-modules/marionette-harness/default.nix
+++ b/pkgs/development/python-modules/marionette-harness/default.nix
@@ -13,12 +13,12 @@
 
 buildPythonPackage rec {
   pname = "marionette-harness";
-  version = "4.0.0";
+  version = "4.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0726zm09nwh4kkd4xirva4596svlifkkpbaywlmq2yb6ayk7d4vl";
+    sha256 = "20c188791e28d586c58acf86ff28cb704c4195a4da6eb10db7b8c6771e3f2983";
   };
 
   propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest 
diff --git a/pkgs/development/python-modules/multidict/default.nix b/pkgs/development/python-modules/multidict/default.nix
index faece73e172f..fc0bdf906275 100644
--- a/pkgs/development/python-modules/multidict/default.nix
+++ b/pkgs/development/python-modules/multidict/default.nix
@@ -7,13 +7,13 @@
 
 let
   pname = "multidict";
-  version = "2.1.6";
+  version = "3.1.3";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "9ec33a1da4d2096949e29ddd66a352aae57fad6b5483087d54566a2f6345ae10";
+    sha256 = "875f80a046e7799b40df4b015b8fc5dae91697936872a8d7362c909a02ec6d12";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/natsort/default.nix b/pkgs/development/python-modules/natsort/default.nix
index 79ec9f5bd896..bd48ad2559c1 100644
--- a/pkgs/development/python-modules/natsort/default.nix
+++ b/pkgs/development/python-modules/natsort/default.nix
@@ -16,7 +16,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "natsort";
-  version = "5.0.3";
+  version = "5.1.0";
 
   buildInputs = [
     hypothesis
@@ -34,7 +34,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1h87n0jcsi6mgjx1pws6g1lmcn8jwabwxj8hq334jvziaq0plyym";
+    sha256 = "5db0fd17c9f8ef3d54962a6e46159ce4807c630f0931169cd15ce54f2ac395b9";
   };
 
   # do not run checks on nix_run_setup.py
diff --git a/pkgs/development/python-modules/nbformat/default.nix b/pkgs/development/python-modules/nbformat/default.nix
index 81340923fde6..6f637bae891b 100644
--- a/pkgs/development/python-modules/nbformat/default.nix
+++ b/pkgs/development/python-modules/nbformat/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "nbformat";
-  version = "4.3.0";
+  version = "4.4.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5febcce872672f1c97569e89323992bdcb8573fdad703f835e6521253191478b";
+    sha256 = "f7494ef0df60766b7cabe0a3651556345a963b74dbc16bc7c18479041170d402";
   };
   LC_ALL="en_US.UTF-8";
 
diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 99c7ce008533..840df8769387 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -14,13 +14,13 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.33.0";
+  version = "0.34.0";
   pname = "numba";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/n/numba/${name}.tar.gz";
-    sha256 = "56c5fcf3175f72b67ba8998d02870e3ea598e10c41d93289cecb9d89be7669fd";
+    sha256 = "4f86df9212cb2678598e6583973ef1df978f3e3ba497b4dc6f91848887710577";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
diff --git a/pkgs/development/python-modules/oslo-config/default.nix b/pkgs/development/python-modules/oslo-config/default.nix
index a76937278c48..6323e72e2a5c 100644
--- a/pkgs/development/python-modules/oslo-config/default.nix
+++ b/pkgs/development/python-modules/oslo-config/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "oslo.config";
-  version = "2.5.0";
+  version = "4.11.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "043mavrzj7vjn7kh1dddci4sf67qwqnnn6cm0k1d19alks9hismz";
+    sha256 = "1be8aaba466a3449fdb21ee8f7025b0d3d252c8c7568b8d5d05ceff58617cd05";
   };
 
   propagatedBuildInputs = [ pbr six netaddr stevedore ];
diff --git a/pkgs/development/python-modules/pbr/default.nix b/pkgs/development/python-modules/pbr/default.nix
index 2fa6c2b39300..75052f271510 100644
--- a/pkgs/development/python-modules/pbr/default.nix
+++ b/pkgs/development/python-modules/pbr/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pbr";
-  version = "3.0.1";
+  version = "3.1.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d7e8917458094002b9a2e0030ba60ba4c834c456071f2d0c1ccb5265992ada91";
+    sha256 = "05f61c71aaefc02d8e37c0a3eeb9815ff526ea28b3b76324769e6158d7f95be1";
   };
 
   # circular dependencies with fixtures
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 18cd9f021fe9..f7b7ecd0abcc 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.7.1";
+  version = "8.8.0";
   name = "${pname}-${version}";
 
   meta = {
@@ -14,6 +14,6 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
-    sha256 = "1zmi2xvh6v4iyfxmrqhj2byfac9xk733w663a7phib7y6wkvqlgr";
+    sha256 = "f8d5eda55e2acdfeb9db9742e1207a5cfb615ad060cabccf1e06a9ed8efd1e49";
   };
 }
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index ed62a0912818..ac3c4f1d3246 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "2.0.12";
+  version = "2.0.15";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0050da900e4420c15766f8dfb8d252510896511361bf485b9308bc0287f7add0";
+    sha256 = "0ecd16a11778674c63615a590e22f79307801eaf009b399bf7e46c486dec8f99";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pycuda/default.nix b/pkgs/development/python-modules/pycuda/default.nix
index 71bf64b77339..83b294321b8a 100644
--- a/pkgs/development/python-modules/pycuda/default.nix
+++ b/pkgs/development/python-modules/pycuda/default.nix
@@ -22,12 +22,12 @@ let
 in
 buildPythonPackage rec {
   pname = "pycuda";
-  version = "2017.1";
+  version = "2017.1.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "a92725ccd8515b4d7284b9127184b6fdb61f224daa086e7fc6b926e2094b055f";
+    sha256 = "6b5a9384e38c603ee429f8a6bee424532db7b3505027ce22f7e18ad19564b563";
   };
 
   preConfigure = ''
diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix
index 911779e67fd7..bed258c1673b 100644
--- a/pkgs/development/python-modules/pygraphviz/default.nix
+++ b/pkgs/development/python-modules/pygraphviz/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pygraphviz";
-  version = "1.4rc1";
+  version = "1.3.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "00ck696rddjnrwfnh1zw87b9xzqfm6sqjy6kqf6kmn1xwsi6f19a";
+    sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
   };
 
   buildInputs = [ doctest-ignore-unicode mock nose ];
diff --git a/pkgs/development/python-modules/pylast/default.nix b/pkgs/development/python-modules/pylast/default.nix
index c2c6ee211c90..99bcb9357dc8 100644
--- a/pkgs/development/python-modules/pylast/default.nix
+++ b/pkgs/development/python-modules/pylast/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pylast";
-  version = "1.8.0";
+  version = "1.9.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "85f8dd96aef0ccba5f80379c3d7bc1fabd72f59aebab040daf40a8b72268f9bd";
+    sha256 = "ae1c4105cbe704d9ac10ba57ac4c26bc576cc33978f1b578101b20c6a2360ca4";
   };
 
   propagatedBuildInputs = [ certifi six ];
diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index ddab1cde1e67..362cef42b783 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2017.1.1";
+  version = "2017.2";
   name = "${pname}-${version}";
 
   buildInputs = [ pytest opencl-headers ocl-icd ];
@@ -24,7 +24,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "928c458a463321c6c91e7fa54bf325bf71d7a8aa5ff750ec8fed2472f6aeb323";
+    sha256 = "039b689a58eb98e27a577ac086210deae959f40d657487f3199d2d217c270ff9";
   };
 
   # gcc: error: pygpu_language_opencl.cpp: No such file or directory
diff --git a/pkgs/development/python-modules/pypandoc/default.nix b/pkgs/development/python-modules/pypandoc/default.nix
index cb7b9ed43fe0..4c694319563e 100644
--- a/pkgs/development/python-modules/pypandoc/default.nix
+++ b/pkgs/development/python-modules/pypandoc/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "pypandoc";
-  version = "1.3.3";
+  version = "1.4";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0628f2kn4gqimnhpf251fgzl723hwgyl3idy69dkzyjvi45s5zm6";
+    sha256 = "e914e6d5f84a76764887e4d909b09d63308725f0cbb5293872c2c92f07c11a5b";
   };
 
   # Fix tests: first requires network access, second is a bug (reported upstream)
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 2e60f6812e95..8465c205295c 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.4.18";
+  version = "0.4.19";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
-    sha256 = "bdcff9f598ff4dda7420675ee387426cd9cc79d795ea73eb684a4314d4b00b9e";
+    sha256 = "122a1e34702287b805742a6edd8fe8483608238bd1602df2d5e3274bd8e8030a";
   };
 
   # requires root priviledges
diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index c3d271caa328..bee5d760c0c6 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, buildPythonPackage, swig, pcsclite }:
 
 buildPythonPackage rec {
-  version = "1.9.5";
+  version = "1.9.6";
   pname = "pyscard";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyscard/${name}.tar.gz";
-    sha256 = "7eef027e1939b7595fc13c03616f262f90d118594fdb6f7620af46b54fa06835";
+    sha256 = "6e28143c623e2b34200d2fa9178dbc80a39b9c068b693b2e6527cdae784c6c12";
   };
 
   patchPhase = ''
diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix
index 966a207e50cf..605c970cedc4 100644
--- a/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -2,13 +2,13 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-asyncio";
-  version = "0.5.0";
+  version = "0.6.0";
 
   disabled = !isPy3k;
 
   src = fetchurl {
     url = "mirror://pypi/p/${pname}/${name}.tar.gz";
-    sha256 = "03sxq8fglr4lw4y6wqlbli9ypr65fxzx6hlpn5wpccx8v5472iff";
+    sha256 = "e5c6786ece4b3bbb0cca1bf68bf089756a62760e3764dc84eaee39bfab70289b";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 600c98925af4..dc1a31a89225 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm }:
+{ stdenv, fetchPypi, buildPythonPackage, isPy3k, execnet, pytest, setuptools_scm, pytest-forked }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "pytest-xdist";
-  version = "1.18.2";
+  version = "1.20.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "10468377901b80255cf192c4603a94ffe8b1f071f5c912868da5f5cb91170dae";
+    sha256 = "7924d45c2430191fe3679a58116c74ceea13307d7822c169d65fd59a24b3a4fe";
   };
 
-  buildInputs = [ pytest setuptools_scm ];
+  buildInputs = [ pytest setuptools_scm pytest-forked];
   propagatedBuildInputs = [ execnet ];
 
   postPatch = ''
diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 402c869c98c9..6e450afbef97 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,6 +1,8 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py }:
+{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py
+, setuptools_scm
+}:
 buildPythonPackage rec {
-  version = "3.0.7";
+  version = "3.2.1";
   pname = "pytest";
   name = "${pname}-${version}";
 
@@ -11,10 +13,10 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/pytest/${name}.tar.gz";
-    sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
+    sha256 = "4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce";
   };
 
-  buildInputs = [ hypothesis ];
+  buildInputs = [ hypothesis setuptools_scm ];
   propagatedBuildInputs = [ py ]
     ++ (stdenv.lib.optional isPy26 argparse);
 
diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix
index bd429a67f245..bb64ff0e2417 100644
--- a/pkgs/development/python-modules/python-editor/default.nix
+++ b/pkgs/development/python-modules/python-editor/default.nix
@@ -1,13 +1,13 @@
 { stdenv, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
-  version = "0.4";
+  version = "1.0.3";
   pname = "python-editor";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1gykxn16anmsbcrwhx3rrhwjif95mmwvq9gjcrr9bbzkdc8sf8a4";
+    sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix
index b09458de5683..16d66a6db217 100644
--- a/pkgs/development/python-modules/qtconsole/default.nix
+++ b/pkgs/development/python-modules/qtconsole/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "qtconsole";
-  version = "4.3.0";
+  version = "4.3.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2821ccf85853b83e4958521f82e36325208787eaf79b19b83905a99cc41aa209";
+    sha256 = "eff8c2faeda567a0bef5781f419a64e9977988db101652b312b9d74ec0a5109c";
   };
 
   buildInputs = [ nose ] ++ lib.optionals isPy27 [mock];
diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index dc42449a3398..f92f77235436 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -3,10 +3,10 @@
 buildPythonPackage rec {
   pname = "relatorio";
   name = "${pname}-${version}";
-  version = "0.6.4";
+  version = "0.7.0";
   src = fetchurl {
     url = "mirror://pypi/r/relatorio/${name}.tar.gz";
-    sha256 = "0lincq79mzgazwd9gh41dybjh9c3n87r83pl8nk3j79aihyfk84z";
+    sha256 = "efd68d96573b15c59c24a8f420ed14210ce51de535a8470d14381f2bed69d845";
   };
   propagatedBuildInputs = [
     genshi
diff --git a/pkgs/development/python-modules/requests-oauthlib.nix b/pkgs/development/python-modules/requests-oauthlib.nix
index 0162d6f6eb5e..1aea747a7840 100644
--- a/pkgs/development/python-modules/requests-oauthlib.nix
+++ b/pkgs/development/python-modules/requests-oauthlib.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl
+{ stdenv, buildPythonPackage, fetchPypi
 , oauthlib, requests }:
 
 buildPythonPackage rec {
@@ -6,8 +6,8 @@ buildPythonPackage rec {
   pname = "requests-oauthlib";
   name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "http://github.com/requests/requests-oauthlib/archive/v${version}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "883ac416757eada6d3d07054ec7092ac21c7f35cb1d2cf82faf205637081f468";
   };
 
diff --git a/pkgs/development/python-modules/rfc3986/default.nix b/pkgs/development/python-modules/rfc3986/default.nix
index 6ebcb7416857..e95699360e94 100644
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "rfc3986";
-  version = "1.0.0";
+  version = "1.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2faacfabcc13ed89b061b5f21cbbf330f82400654b317b5907d311c3478ec4c4";
+    sha256 = "8458571c4c57e1cf23593ad860bb601b6a604df6217f829c2bc70dc4b5af941b";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index a34b2d2ccfa9..86ceb5a233b5 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "semver";
-  version = "2.2.1";
+  version = "2.7.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
+    sha256 = "20ffbb50248a6141bb9eba907db0e47ee4a239ddb55fe0ada8696fc241495a9d";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index fa2b810964f9..b6bf629e7467 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -8,13 +8,13 @@
 # Should use buildPythonPackage here somehow
 stdenv.mkDerivation rec {
   pname = "setuptools";
-  version = "36.0.1";
+  version = "36.2.7";
   name = "${python.libPrefix}-${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "e17c4687fddd6d70a6604ac0ad25e33324cec71b5137267dd5c45e103c4b288a";
+    sha256 = "b0fe5d432d922df595e918577c51458d63f245115d141b309ac32ecfca329df5";
   };
 
   buildInputs = [ python wrapPython unzip ];
diff --git a/pkgs/development/python-modules/simplejson/default.nix b/pkgs/development/python-modules/simplejson/default.nix
index 4deac80fb06d..846e8dc21a16 100644
--- a/pkgs/development/python-modules/simplejson/default.nix
+++ b/pkgs/development/python-modules/simplejson/default.nix
@@ -6,13 +6,13 @@
 
 buildPythonPackage rec {
   pname = "simplejson";
-  version = "3.10.0";
+  version = "3.11.1";
   name = "${pname}-${version}";
   doCheck = !stdenv.isDarwin;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "953be622e88323c6f43fad61ffd05bebe73b9fd9863a46d68b052d2aa7d71ce2";
+    sha256 = "01a22d49ddd9a168b136f26cac87d9a335660ce07aa5c630b8e3607d6f4325e7";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index ae08db31b2a8..605ab3b3a602 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -20,18 +20,21 @@
 , whoosh
 , imagesize
 , requests
+, sphinxcontrib-websupport
 }:
 
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Sphinx";
-  version = "1.5.2";
+  version = "1.6.3";
   src = fetchPypi {
     inherit pname version;
-    sha256 = "049c48393909e4704a6ed4de76fd39c8622e165414660bfb767e981e7931c722";
+    sha256 = "af8bdb8c714552b77d01d4536e3d6d2879d6cb9d25423d29163d5788e27046e6";
   };
   LC_ALL = "en_US.UTF-8";
-  buildInputs = [ pytest simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
+
+  checkInputs = [ pytest ];
+  buildInputs = [ simplejson mock glibcLocales html5lib ] ++ lib.optional (pythonOlder "3.4") enum34;
   # Disable two tests that require network access.
   checkPhase = ''
     cd tests; ${python.interpreter} run.py --ignore py35 -k 'not test_defaults and not test_anchors_ignored'
@@ -48,8 +51,12 @@ buildPythonPackage rec {
     whoosh
     imagesize
     requests
+    sphinxcontrib-websupport
   ];
 
+  # Lots of tests. Needs network as well at some point.
+  doCheck = false;
+
   # https://github.com/NixOS/nixpkgs/issues/22501
   # Do not run `python sphinx-build arguments` but `sphinx-build arguments`.
   postPatch = ''
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 36b04692a9e5..a6fefaa16121 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.1.12";
+  version = "1.1.13";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d501527319f51a3d9eb639b654222c6f67287228a98ba102b1d0b598eb3266c9";
+    sha256 = "2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898";
   };
 
   checkInputs = [ pytest mock pytest_xdist ]
diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix
index 1478de78bba5..0625dd851e5b 100644
--- a/pkgs/development/python-modules/stevedore/default.nix
+++ b/pkgs/development/python-modules/stevedore/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "stevedore";
-  version = "1.21.0";
+  version = "1.25.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12sg88ax0lv2sxr685rqdaxm9gryjrpj4fvax459zvwy1r4n83ma";
+    sha256 = "c8a373b90487b7a1b52ebaa3ca5059315bf68d9ebe15b2203c2fa675bd7e1e7e";
   };
 
   doCheck = false;
diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix
index fc16d77b4810..8755a1d4b635 100644
--- a/pkgs/development/python-modules/stripe/default.nix
+++ b/pkgs/development/python-modules/stripe/default.nix
@@ -3,7 +3,7 @@
 
 buildPythonPackage rec {
   pname = "stripe";
-  version = "1.41.1";
+  version = "1.62.1";
   name = "${pname}-${version}";
 
   # Tests require network connectivity and there's no easy way to disable
@@ -12,7 +12,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0zvffvq933ia5w5ll6xhx2zgvppgc6zc2mxhc6f0kypw5g2fxvz5";
+    sha256 = "7cc83b8d405a48d8a792640761519c64e373ad3514ea8bb4a9a5128f98b0b679";
   };
 
   buildInputs = [ unittest2 mock ];
diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix
index 6a0dd6a36552..bc6d7c2fba98 100644
--- a/pkgs/development/python-modules/tqdm/default.nix
+++ b/pkgs/development/python-modules/tqdm/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "tqdm";
-  version = "4.11.2";
+  version = "4.15.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "14baa7a9ea7723d46f60de5f8c6f20e840baa7e3e193bf0d9ec5fe9103a15254";
+    sha256 = "6ec1dc74efacf2cda936b4a6cf4082ce224c76763bdec9f17e437c8cfcaa9953";
   };
 
   buildInputs = [ nose coverage glibcLocales flake8 ];
diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix
index 7bb028b233d9..5ee984941d07 100644
--- a/pkgs/development/python-modules/treq/default.nix
+++ b/pkgs/development/python-modules/treq/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "treq";
-  version = "17.3.1";
+  version = "17.8.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1xhcpvsl3xqw0dq9sixk80iwyiv17djigp3815sy5pfgvvggcfii";
+    sha256 = "ef72d2d5e0b24bdf29267b608fa33df0ac401743af8524438b073e1fb2b66f16";
   };
 
   propagatedBuildInputs = [ twisted requests six incremental service-identity ];
diff --git a/pkgs/development/python-modules/txaio/default.nix b/pkgs/development/python-modules/txaio/default.nix
index 98060536638e..27ce7a99fa77 100644
--- a/pkgs/development/python-modules/txaio/default.nix
+++ b/pkgs/development/python-modules/txaio/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "txaio";
-  version = "2.7.1";
+  version = "2.8.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1lmllmjjsqzl3w4faq2qhlgkaqn1yn1m7d99k822ib7qgz18bsly";
+    sha256 = "fe2e0e4d3a06705f86bbd351fdd1f39dae61755e44162375e024acbf32eafddb";
   };
 
   buildInputs = [ pytest mock ];
diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix
index efdce1e6dba3..beed65449148 100644
--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "vega";
-  version = "0.4.4";
+  version = "0.5.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "08k92afnk0bivm07h1l5nh26xl2rfp7qn03aq17q1hr3fs5r6cdm";
+    sha256 = "9871bce3a00bb775d9f7f8212aa237f99f11ca7cfe6ecf246773f5559f20c38c";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix
index f6d3a747ee48..df0c83605f75 100644
--- a/pkgs/development/python-modules/virtualenv/default.nix
+++ b/pkgs/development/python-modules/virtualenv/default.nix
@@ -6,12 +6,12 @@
 
 buildPythonPackage rec {
   pname = "virtualenv";
-  version = "15.0.3";
+  version = "15.1.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "6d9c760d3fc5fa0894b0f99b9de82a4647e1164f0b700a7f99055034bf548b1d";
+    sha256 = "02f8102c2436bb03b3ee6dede1919d1dac8a427541652e5ec95171ec8adbc93a";
   };
 
   # Doubt this is needed - FRidh 2017-07-07
diff --git a/pkgs/development/python-modules/websockets/default.nix b/pkgs/development/python-modules/websockets/default.nix
index 7e29b2b61902..488036552583 100644
--- a/pkgs/development/python-modules/websockets/default.nix
+++ b/pkgs/development/python-modules/websockets/default.nix
@@ -6,13 +6,13 @@
 
 let
   pname = "websockets";
-  version = "3.3";
+  version = "3.4";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "305ab7fdd86afd08c2723461c949e153f7b01233f95a108619a15e41b7a74c93";
+    sha256 = "43e5b9f51dd0000a4c6f646e2ade0c886bd14a784ffac08b9e079bd17a63bcc5";
   };
 
   disabled = pythonOlder "3.3";
diff --git a/pkgs/development/python-modules/widgetsnbextension/default.nix b/pkgs/development/python-modules/widgetsnbextension/default.nix
index dda58c65f60c..80c5abeb47c1 100644
--- a/pkgs/development/python-modules/widgetsnbextension/default.nix
+++ b/pkgs/development/python-modules/widgetsnbextension/default.nix
@@ -8,11 +8,11 @@
 buildPythonPackage rec {
   pname = "widgetsnbextension";
   name = "${pname}-${version}";
-  version = "2.0.0";
+  version = "3.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "566582a84642d0c0f78b756a954450a38a8743eeb8dad04b7cab3ca66f455e6f";
+    sha256 = "e8890d87c80782ee4ea3ed9afffc89a0af8b4ff475d1608d900f728ea55f041c";
   };
 
   propagatedBuildInputs = [ notebook ];
diff --git a/pkgs/development/python-modules/xlwt/default.nix b/pkgs/development/python-modules/xlwt/default.nix
index f25646fffdbb..82364ee1d1c4 100644
--- a/pkgs/development/python-modules/xlwt/default.nix
+++ b/pkgs/development/python-modules/xlwt/default.nix
@@ -8,11 +8,11 @@
 buildPythonPackage rec {
   pname = "xlwt";
   name = "${pname}-${version}";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "505669c1eb6a60823fd3e2e723b60eea95f2c56254113bf163091ed2bedb4ac9";
+    sha256 = "c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88";
   };
 
   buildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/yamllint/default.nix b/pkgs/development/python-modules/yamllint/default.nix
index 1d4672312a20..2f0b12618e5d 100644
--- a/pkgs/development/python-modules/yamllint/default.nix
+++ b/pkgs/development/python-modules/yamllint/default.nix
@@ -3,12 +3,12 @@
 
 buildPythonPackage rec {
   pname = "yamllint";
-  version = "0.5.2";
+  version = "1.8.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0brdy1crhfng10hlw0420bv10c2xnjk8ndnhssybkzym47yrzg84";
+    sha256 = "048743567ca9511e19222233ebb53795586a2cede07b79e801577e0a9b4f173c";
   };
 
   buildInputs = [ nose ];
diff --git a/pkgs/development/python-modules/yapf/default.nix b/pkgs/development/python-modules/yapf/default.nix
index 86ef792a437c..4bdfbccadf14 100644
--- a/pkgs/development/python-modules/yapf/default.nix
+++ b/pkgs/development/python-modules/yapf/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "yapf";
-  version = "0.16.3";
+  version = "0.17.0";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1qxq41y65saljw0jk5fzinvynr9fhwzqcjsxxs8bn78in073x7a2";
+    sha256 = "5472f4c95ab9b9fe9f5bf74ece3c986bfafa1f98ad9e1e296d4c35d291c97856";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 0455efc31276..046b749ffa72 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -8,12 +8,12 @@
 
 let
   pname = "yarl";
-  version = "0.10.3";
+  version = "0.12.0";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "27b24ba3ef3cb8475aea1a655a1750bb11918ba139278af21db5846ee9643138";
+    sha256 = "fc0f71ffdce882b4d4b287b0b3a68d9f2557ab14cc2c10ce4df714c42512cbde";
   };
 
   buildInputs = [ pytest pytestrunner ];
diff --git a/pkgs/development/python-modules/zeep/default.nix b/pkgs/development/python-modules/zeep/default.nix
index 8d6670aa8507..0f19e7f4e5d8 100644
--- a/pkgs/development/python-modules/zeep/default.nix
+++ b/pkgs/development/python-modules/zeep/default.nix
@@ -24,13 +24,13 @@
 
 let
   pname = "zeep";
-  version = "2.0.0";
+  version = "2.3.0";
 in buildPythonPackage {
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5b9bd6b8772d6b505118c11d6924eb7df0decf12bbbeb43b1c27d781817361ad";
+    sha256 = "b01d81c61d7b7858b7be001615d3c995a371815f5e6902c914fea9beba30b716";
   };
 
   propagatedBuildInputs = [

From d2b5850ad08b48f92f07f8a80aaccd6535cc7077 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 20 Jul 2017 14:29:52 +0200
Subject: [PATCH 25/75] pythonPackages.py: 1.4.31 -> 1.4.34

---
 .../development/python-modules/py/default.nix | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 19 +-----------------
 2 files changed, 21 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/development/python-modules/py/default.nix

diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix
new file mode 100644
index 000000000000..0dc3b6793281
--- /dev/null
+++ b/pkgs/development/python-modules/py/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+buildPythonPackage rec {
+  pname = "py";
+  version = "1.4.34";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1qyd5z0hv8ymxy84v5vig3vps2fvhcf4bdlksb3r03h549fmhb8g";
+  };
+
+  # Circular dependency on pytest
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Library with cross-python path, ini-parsing, io, code, log facilities";
+    homepage = http://pylib.readthedocs.org/;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f3ed5f898327..4a4f0231e156 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17170,24 +17170,7 @@ in {
   };
 
 
-  py = buildPythonPackage rec {
-    name = "py-${version}";
-    version = "1.4.31";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/py/${name}.tar.gz";
-      sha256 = "a6501963c725fc2554dabfece8ae9a8fb5e149c0ac0a42fd2b02c5c1c57fc114";
-    };
-
-    # Circular dependency on pytest
-    doCheck = false;
-
-    meta = {
-      description = "Library with cross-python path, ini-parsing, io, code, log facilities";
-      homepage = http://pylib.readthedocs.org/;
-      license = licenses.mit;
-    };
-  };
+  py = callPackage ../development/python-modules/py { };
 
 
   pyacoustid = buildPythonPackage rec {

From 84c6e6b4d708faae843ea00a2335dd80b57fd107 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 20 Jul 2017 14:57:57 +0200
Subject: [PATCH 26/75] pythonPackages.setuptools_scm: 1.15.0 -> 1.15.6

---
 .../python-modules/setuptools_scm/default.nix | 24 +++++++++++++++++
 pkgs/top-level/python-packages.nix            | 26 +------------------
 2 files changed, 25 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/development/python-modules/setuptools_scm/default.nix

diff --git a/pkgs/development/python-modules/setuptools_scm/default.nix b/pkgs/development/python-modules/setuptools_scm/default.nix
new file mode 100644
index 000000000000..260f899f56d8
--- /dev/null
+++ b/pkgs/development/python-modules/setuptools_scm/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildPythonPackage, fetchPypi, pip }:
+buildPythonPackage rec {
+  pname = "setuptools_scm";
+  name = "${pname}-${version}";
+  version = "1.15.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0pzvfmx8s20yrgkgwfbxaspz2x1g38qv61jpm0ns91lrb22ldas9";
+  };
+
+  buildInputs = [ pip ];
+
+  # Seems to fail due to chroot and would cause circular dependency
+  # with pytest
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://bitbucket.org/pypa/setuptools_scm/;
+    description = "Handles managing your python package versions in scm metadata";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jgeerds ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4a4f0231e156..4f3c5327cfda 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21025,31 +21025,7 @@ in {
     '';
   };
 
-  setuptools_scm = buildPythonPackage rec {
-    name = "setuptools_scm-${version}";
-    version = "1.15.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/setuptools_scm/${name}.tar.gz";
-      sha256 = "0bwyc5markib0i7i2qlyhdzxhiywzxbkfiapldma8m91m82jvwfs";
-    };
-
-    buildInputs = with self; [ pip ];
-    checkInputs = with self; [ pytest ];
-    # Seems to fail due to chroot
-    doCheck = false;
-
-    checkPhase = ''
-      py.test
-    '';
-
-    meta = with stdenv.lib; {
-      homepage = https://bitbucket.org/pypa/setuptools_scm/;
-      description = "Handles managing your python package versions in scm metadata";
-      license = licenses.mit;
-      maintainers = with maintainers; [ jgeerds ];
-    };
-  };
+  setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
 
   setuptools_scm_18 = self.setuptools_scm.override rec {
     name = "setuptools_scm-${version}";

From da32df875b7484a2099ede34682150fd9cc8865f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 19:47:07 +0200
Subject: [PATCH 27/75] python.pkgs.pytest-django: fix hash patch

---
 pkgs/development/python-modules/pytest-django/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytest-django/default.nix b/pkgs/development/python-modules/pytest-django/default.nix
index 0fd485684464..a91bf9d6d0e3 100644
--- a/pkgs/development/python-modules/pytest-django/default.nix
+++ b/pkgs/development/python-modules/pytest-django/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     # Unpin setuptools-scm
     (fetchpatch {
       url = "https://github.com/pytest-dev/pytest-django/commit/25cbc3b395dcdeb92bdc9414e296680c2b9d602e.patch";
-      sha256 = "0mz3rcsv44pfzlxy3pv8mx87glmv34gy0d5aknvbzgb2a9niryws";
+      sha256 = "1mx06y4kz2zs41mb2h9bh5p4jc6s6hfsq6fghhsks5b7qak05xjp";
     })
   ];
 

From 2930c655570f26a149ffb14d527229940a84f3aa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 19:47:48 +0200
Subject: [PATCH 28/75] python.pkgs.setuptools_scm_18: remove

because we do not keep multiple versions and it is not used anywhere.
---
 pkgs/top-level/python-packages.nix | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4f3c5327cfda..c50713ad6761 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21027,19 +21027,6 @@ in {
 
   setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
 
-  setuptools_scm_18 = self.setuptools_scm.override rec {
-    name = "setuptools_scm-${version}";
-    version = "1.8.0";
-
-    # tests fail: ImportError: cannot import name 'find_files'
-    disabled = isPy35;
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/setuptools_scm/${name}.tar.bz2";
-      sha256 = "00p60v2yfqy1r58pjcx9wy6dvqd7wkpfs5z1dzwf7y75c1g3dgyx";
-    };
-  };
-
   setuptoolsDarcs = buildPythonPackage rec {
     name = "setuptools_darcs-${version}";
     version = "1.2.11";

From f30d3635f56bdf23d11a2f5126f20f1740ceb6ac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 20:13:55 +0200
Subject: [PATCH 29/75] python.pkgs.pytest-forked: init at 0.2

---
 .../python-modules/pytest-forked/default.nix  | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-forked/default.nix

diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix
new file mode 100644
index 000000000000..4d04fa61f232
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-forked/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, setuptools_scm
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-forked";
+  version = "0.2";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "e4500cd0509ec4a26535f7d4112a8cc0f17d3a41c29ffd4eab479d2a55b30805";
+  };
+
+  buildInputs = [ pytest setuptools_scm ];
+
+  # Do not function
+  doCheck = false;
+
+  checkPhase = ''
+    py.test testing
+  '';
+
+  meta = {
+    description = "Run tests in isolated forked subprocesses";
+    homepage = https://github.com/pytest-dev/pytest-forked;
+    license = lib.licenses.mit;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c50713ad6761..8a631f3d3c76 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4223,6 +4223,8 @@ in {
     };
   };
 
+  pytest-forked = callPackage ../development/python-modules/pytest-forked { };
+
   pytest-rerunfailures = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "pytest-rerunfailures";

From e7b5917af1d5cb8e3b041ae1da6c3c0af48c4fb7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 20:23:09 +0200
Subject: [PATCH 30/75] python.pkgs.fetchPypi: makeOverridable

to make it easier to override packages to use a newer version.
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8a631f3d3c76..9442ccd90afa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -62,7 +62,7 @@ let
 
   graphiteVersion = "0.9.15";
 
-  fetchPypi = {format ? "setuptools", ... } @attrs:
+  fetchPypi = makeOverridable( {format ? "setuptools", ... } @attrs:
     let
       fetchWheel = {pname, version, sha256, python ? "py2.py3", abi ? "none", platform ? "any"}:
       # Fetch a wheel. By default we fetch an universal wheel.
@@ -78,7 +78,7 @@ let
       fetcher = (if format == "wheel" then fetchWheel
         else if format == "setuptools" then fetchSource
         else throw "Unsupported kind ${kind}");
-    in fetcher (builtins.removeAttrs attrs ["format"]);
+    in fetcher (builtins.removeAttrs attrs ["format"]) );
 
   # This should become part of stdenv!
   sharedLibraryExtension = if stdenv.isDarwin then ".dylib" else ".so";

From 19183d17eda80e7b8ffab7d6d0d813e24e27ae0c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 24 Aug 2017 20:24:06 +0200
Subject: [PATCH 31/75] mitmproxy: use older tornado

because python.pkgs.tornado is not < 4.5 anymore.
---
 pkgs/tools/networking/mitmproxy/default.nix | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 7d36b6b4ac77..70a9366c07cd 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -1,6 +1,20 @@
-{ stdenv, fetchpatch, fetchFromGitHub, python3Packages }:
+{ stdenv, fetchpatch, fetchFromGitHub, python3 }:
 
-python3Packages.buildPythonPackage rec {
+let
+  # mitmproxy needs an older tornado version
+  python = python3.override {
+    packageOverrides = self: super: {
+      tornado = super.tornado.overridePythonAttrs (oldAttrs: rec {
+        version = "4.4.3";
+        name = "${oldAttrs.pname}-${version}";
+        src = oldAttrs.src.override {
+          inherit version;
+          sha256 = "f267acc96d5cf3df0fd8a7bfb5a91c2eb4ec81d5962d1a7386ceb34c655634a8";
+        };
+      });
+    };
+  };
+in python.pkgs.buildPythonPackage rec {
   baseName = "mitmproxy";
   name = "${baseName}-${version}";
   version = "2.0.2";
@@ -21,7 +35,7 @@ python3Packages.buildPythonPackage rec {
     })
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  propagatedBuildInputs = with python.pkgs; [
     blinker click certifi construct cryptography
     cssutils editorconfig h2 html2text hyperframe
     jsbeautifier kaitaistruct passlib pyasn1 pyopenssl

From 84adeffc6dd9f8ca2510ce51b53559946feeebf2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:28:47 +0200
Subject: [PATCH 32/75] mypy: 0.511 -> 0.521

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

diff --git a/pkgs/development/tools/mypy/default.nix b/pkgs/development/tools/mypy/default.nix
index a68b29dee248..9f5685043171 100644
--- a/pkgs/development/tools/mypy/default.nix
+++ b/pkgs/development/tools/mypy/default.nix
@@ -3,14 +3,14 @@
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "mypy";
-  version = "0.511";
+  version = "0.521";
 
   # Tests not included in pip package.
   doCheck = false;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1vmfyi6zh49mi7rmns5hjgpqshq7islxwsgp80j1izf82r8xgx1z";
+    sha256 = "9d30df20cd937b80cfc6007d75426f27a232789cfa288c63bf9370f2542c9658";
   };
 
   propagatedBuildInputs = [ lxml typed-ast ];

From 1e4029fa0a36e9948c3df7afd276e9651cea1a85 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:34:58 +0200
Subject: [PATCH 33/75] python.pkgs.python-editor: fix by disabling tests

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

diff --git a/pkgs/development/python-modules/python-editor/default.nix b/pkgs/development/python-modules/python-editor/default.nix
index bb64ff0e2417..d2941e4c572b 100644
--- a/pkgs/development/python-modules/python-editor/default.nix
+++ b/pkgs/development/python-modules/python-editor/default.nix
@@ -10,8 +10,12 @@ buildPythonPackage rec {
     sha256 = "a3c066acee22a1c94f63938341d4fb374e3fdd69366ed6603d7b24bed1efc565";
   };
 
+  # No proper tests
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "A library that provides the `editor` module for programmatically";
     homepage = https://github.com/fmoo/python-editor;
+    license = licenses.asl20;
   };
 }

From b1c1892e2d5b2d47d1b89f22331f479c7d947096 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:40:49 +0200
Subject: [PATCH 34/75] python.pkgs.odfpy: 0.9.6 -> 1.3.5

---
 .../python-modules/odfpy/default.nix          | 29 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 +------------
 2 files changed, 30 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/python-modules/odfpy/default.nix

diff --git a/pkgs/development/python-modules/odfpy/default.nix b/pkgs/development/python-modules/odfpy/default.nix
new file mode 100644
index 000000000000..a80cd827c6d1
--- /dev/null
+++ b/pkgs/development/python-modules/odfpy/default.nix
@@ -0,0 +1,29 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "odfpy";
+  version = "1.3.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "6f8163f8464868cff9421a058f25566e41d73c8f7e849c021b86630941b44366";
+  };
+
+  checkPhase = ''
+    pushd tests
+    rm runtests
+    for file in test*.py; do
+        python  $file
+    done
+  '';
+
+  meta = {
+    description = "Python API and tools to manipulate OpenDocument files";
+    homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
+    license = lib.licenses.asl20;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9442ccd90afa..c8aa5048f5e8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7365,25 +7365,7 @@ in {
     };
   };
 
-  odfpy = buildPythonPackage rec {
-    version = "0.9.6";
-    name = "odfpy-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/o/odfpy/${name}.tar.gz";
-      sha256 = "e458f969f1ccd7ed77d70a45fe69ad656ac61b39e36e4d32c42d4e3216030891";
-    };
-
-    buildInputs = with self; with pkgs; [ ];
-
-    propagatedBuildInputs = with self; [ ];
-
-    meta = {
-      description = "Python API and tools to manipulate OpenDocument files";
-      homepage = "https://joinup.ec.europa.eu/software/odfpy/home";
-      license = licenses.asl20;
-    };
-  };
+  odfpy = callPackage ../development/python-modules/odfpy { };
 
   oger = buildPythonPackage rec {
     name = "oger-${version}";

From fec771fbb4aa697a94ccce32528e4e7604ff01c6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:44:16 +0200
Subject: [PATCH 35/75] python.pkgs.pyx: disable tests to fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c8aa5048f5e8..eaca28dec6e1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18145,6 +18145,9 @@ in {
     };
 
     disabled = !isPy3k;
+    
+    # No tests in archive
+    doCheck = false;
 
     meta = {
       description = "Python package for the generation of PostScript, PDF, and SVG files";

From 7e6be0968b9f2116410e9ae6ca2a53d2740bff00 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:48:01 +0200
Subject: [PATCH 36/75] python.pkgs.raven: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eaca28dec6e1..e31c04cb7596 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8192,6 +8192,8 @@ in {
     # see https://github.com/getsentry/raven-python/blob/master/setup.py
     doCheck = false;
 
+    propagatedBuildInputs = optionals (!isPy3k) [ self.contextlib2 ];
+
     meta = {
       maintainers = with maintainers; [ primeos ];
     };

From 492390cfad41c6936a4ac6edf6f6370ac8bdf8df Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:52:18 +0200
Subject: [PATCH 37/75] python.pkgs.relatorio: fix build

---
 pkgs/development/python-modules/relatorio/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix
index f92f77235436..1010766cf2da 100644
--- a/pkgs/development/python-modules/relatorio/default.nix
+++ b/pkgs/development/python-modules/relatorio/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonPackage, genshi, lxml }:
+{ lib, fetchurl, buildPythonPackage, genshi, lxml, python_magic }:
 
 buildPythonPackage rec {
   pname = "relatorio";
@@ -11,6 +11,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     genshi
     lxml
+    python_magic
   ];
   meta = {
     homepage = http://relatorio.tryton.org/;

From d019bb0123b134d3f1f50d2ae67321d6886ae58c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:56:05 +0200
Subject: [PATCH 38/75] python.pkgs.robomachine: fix build

---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e31c04cb7596..eb7305214825 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20319,6 +20319,10 @@ in {
       rm "$out/bin/"*.bat
     '';
 
+    postPatch = ''
+      substituteInPlace setup.py --replace "argparse" ""
+    '';
+
     meta = {
       description = "Test data generator for Robot Framework";
       homepage = https://github.com/mkorpela/RoboMachine;

From 3efa08baea6a38f3957d1a67cd860ba85dbd864a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 10:57:54 +0200
Subject: [PATCH 39/75] python.pkgs.semver: disable tests to fix build

---
 pkgs/development/python-modules/semver/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/semver/default.nix b/pkgs/development/python-modules/semver/default.nix
index 86ceb5a233b5..2d592962558c 100644
--- a/pkgs/development/python-modules/semver/default.nix
+++ b/pkgs/development/python-modules/semver/default.nix
@@ -10,6 +10,9 @@ buildPythonPackage rec {
     sha256 = "20ffbb50248a6141bb9eba907db0e47ee4a239ddb55fe0ada8696fc241495a9d";
   };
 
+  # No tests in archive
+  doCheck = false;
+
   meta = with stdenv.lib; {
     description = "Python package to work with Semantic Versioning (http://semver.org/)";
     homepage = https://github.com/k-bx/python-semver;

From b101bdddacad04a24fd000e1db63c22522f711c4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 11:04:45 +0200
Subject: [PATCH 40/75] python.pkgs.jsonpatch: 1.11 -> 1.16

---
 .../python-modules/jsonpatch/default.nix      | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 17 +-----------
 2 files changed, 27 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/development/python-modules/jsonpatch/default.nix

diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix
new file mode 100644
index 000000000000..39f36b1d9494
--- /dev/null
+++ b/pkgs/development/python-modules/jsonpatch/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, jsonpointer
+}:
+
+buildPythonPackage rec {
+  pname = "jsonpatch";
+  version = "1.16";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f025c28a08ce747429ee746bb21796c3b6417ec82288f8fe6514db7398f2af8a";
+  };
+
+  # test files are missing
+  doCheck = false;
+  propagatedBuildInputs = [ jsonpointer ];
+
+  meta = {
+    description = "Library to apply JSON Patches according to RFC 6902";
+    homepage = "https://github.com/stefankoegl/python-json-patch";
+    license = lib.licenses.bsd2; # "Modified BSD license, says pypi"
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb7305214825..3b16bd364449 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6785,22 +6785,7 @@ in {
     };
   };
 
-  jsonpatch = buildPythonPackage rec {
-    name = "jsonpatch-1.11";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/j/jsonpatch/${name}.tar.gz";
-      sha256 = "22d0bc0f5522a4a03dd9fb4c4cdf7c1f03256546c88be4c61e5ceabd22280e47";
-    };
-
-    propagatedBuildInputs = with self; [ jsonpointer ];
-
-    meta = {
-      description = "Library to apply JSON Patches according to RFC 6902";
-      homepage = "https://github.com/stefankoegl/python-json-patch";
-      license = stdenv.lib.licenses.bsd2; # "Modified BSD license, says pypi"
-    };
-  };
+  jsonpatch = callPackage ../development/python-modules/jsonpatch { };
 
   jsonpointer = buildPythonPackage rec {
     name = "jsonpointer-1.9";

From f6eb190e7030feac015bd1624d0dbb6825e28a9e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 11:17:54 +0200
Subject: [PATCH 41/75] python.pkgs.pyrtlsdr: disable tests to fix build

---
 .../python-modules/pyrtlsdr/default.nix       | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +------------
 2 files changed, 32 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/pyrtlsdr/default.nix

diff --git a/pkgs/development/python-modules/pyrtlsdr/default.nix b/pkgs/development/python-modules/pyrtlsdr/default.nix
new file mode 100644
index 000000000000..4ce373ee7ad2
--- /dev/null
+++ b/pkgs/development/python-modules/pyrtlsdr/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, rtl-sdr
+}:
+
+buildPythonPackage rec {
+  pname = "pyrtlsdr";
+  version = "0.2.5";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "dd041143b68628c713c2227c78c40b0b4a0cb5d08df116f7bdc5f83c529be0e4";
+  };
+
+  postPatch = ''
+    sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
+  '';
+
+  # No tests that can be used.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)";
+    homepage = https://github.com/roger-/pyrtlsdr;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ bjornfor ];
+ };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3b16bd364449..359e50f0cbf6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8452,26 +8452,7 @@ in {
   };
 
 
-  pyrtlsdr = buildPythonPackage rec {
-    name = "pyrtlsdr-0.2.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/p/pyrtlsdr/${name}.zip";
-      sha256 = "cbb9086efe4320858c48f4856d09f7face191c4156510b1459ef4e5588935b6a";
-    };
-
-    postPatch = ''
-      sed "s|driver_files =.*|driver_files = ['${pkgs.rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
-    '';
-
-    meta = {
-      description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)";
-      homepage = https://github.com/roger-/pyrtlsdr;
-      license = licenses.gpl3;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ bjornfor ];
-    };
-  };
+  pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { };
 
   random2 = self.buildPythonPackage rec {
     name = "random2-1.0.1";

From 7a6b150f94b601e4c865f70fec31391d14fa4611 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 11:22:30 +0200
Subject: [PATCH 42/75] python.pkgs.sqlmap: 1.0.11 -> 1.1.18

---
 .../python-modules/sqlmap/default.nix         | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 16 +-----------
 2 files changed, 26 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/python-modules/sqlmap/default.nix

diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
new file mode 100644
index 000000000000..a440abb51498
--- /dev/null
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "sqlmap";
+  version = "1.1.8";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "f8f88fc7fe0ba81a7558902f87df31c052e27404caa26a160174747afcaebe49";
+  };
+
+  # No tests in archive
+  doCheck = false;
+
+  meta = with lib; {
+    homepage = "http://sqlmap.org";
+    license = licenses.gpl2;
+    description = "Automatic SQL injection and database takeover tool";
+    maintainers = with maintainers; [ bennofs ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 359e50f0cbf6..0d93e5716df1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21328,21 +21328,7 @@ in {
     };
   };
 
-  sqlmap = buildPythonPackage {
-    name = "sqlmap-1.0.11";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/sqlmap/sqlmap-1.0.11.tar.gz";
-      sha256 = "1x4amyjqnd9j5g2kp9nvg8pr5sqzbhr8gd0m6d671bshvgj568vr";
-    };
-
-    meta = with pkgs.stdenv.lib; {
-      homepage = "http://sqlmap.org";
-      license = licenses.gpl2;
-      description = "Automatic SQL injection and database takeover tool";
-      maintainers = with stdenv.lib.maintainers; [ bennofs ];
-    };
-  };
+  sqlmap = callPackage ../development/python-modules/sqlmap { };
 
   pgpdump = self.buildPythonPackage rec {
     name = "pgpdump-1.5";

From 673e0520c619acdd4c646987eb3461242e1b6c9e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 16:21:51 +0200
Subject: [PATCH 43/75] python.pkgs.click: disable tests

because of broken tests
---
 pkgs/top-level/python-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0d93e5716df1..86c2022e38c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2910,8 +2910,8 @@ in {
       py.test tests
     '';
 
-    # Python 3.5 str/bytes-like errors with reading files
-    doCheck = !isPy3k;
+    # https://github.com/pallets/click/issues/823
+    doCheck = false;
 
     meta = {
       homepage = http://click.pocoo.org/;

From da006013065d1c6f31009ac35eb18933fd50f629 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 17:38:35 +0200
Subject: [PATCH 44/75] pytest fixup

---
 pkgs/applications/office/fava/default.nix | 2 +-
 pkgs/top-level/python-packages.nix        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix
index 437a0cbbd133..7bc549dd0fc5 100644
--- a/pkgs/applications/office/fava/default.nix
+++ b/pkgs/applications/office/fava/default.nix
@@ -16,7 +16,7 @@ python3Packages.buildPythonApplication rec {
     sha256 = "0yn2psbn436g1w5ixn94z8ca6dfd54izg98979arn0k7slpiccvz";
   };
 
-  buildInputs = with python3Packages; [ pytest_30 ];
+  checkInputs = with python3Packages; [ pytest ];
 
   checkPhase = ''
     # pyexcel is optional
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86c2022e38c9..551aed366696 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4129,7 +4129,7 @@ in {
     };
   };
 
-  pytest = self.pytest_30;
+  pytest = self.pytest_32;
 
   pytest_27 = callPackage ../development/python-modules/pytest/2_7.nix {};
 
@@ -4137,7 +4137,7 @@ in {
 
   pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
 
-  pytest_30 = callPackage ../development/python-modules/pytest{
+  pytest_32 = callPackage ../development/python-modules/pytest{
     hypothesis = self.hypothesis.override {
       # hypothesis requires pytest that causes dependency cycle
       doCheck = false;

From e0a23575d226e2ffb29ea76a7dd0867ecda541a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 17:41:36 +0200
Subject: [PATCH 45/75] python.pkgs.pyzmq: fix broken test

which I think will be solved in 17.0.0 which should be released within
weeks.
---
 pkgs/top-level/python-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 551aed366696..4ed3b0727494 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25077,7 +25077,7 @@ EOF
     # Disable broken test
     # https://github.com/zeromq/pyzmq/issues/799
     checkPhase = ''
-      py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send"
+      py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send and not test_recv_json_cancelled"
     '';
   };
 

From 997043c1372b16f39000238874aff263bdeab153 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 17:51:18 +0200
Subject: [PATCH 46/75] bepasty: move out of python-packages

because its a (web) application and thus doesn't belong there.
---
 nixos/modules/services/misc/bepasty.nix |  2 +-
 pkgs/tools/misc/bepasty/default.nix     | 34 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 pkgs/top-level/python-packages.nix      | 27 --------------------
 4 files changed, 37 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/tools/misc/bepasty/default.nix

diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix
index 4d78cddcb54f..c499e428af35 100644
--- a/nixos/modules/services/misc/bepasty.nix
+++ b/nixos/modules/services/misc/bepasty.nix
@@ -3,7 +3,7 @@
 with lib;
 let
   gunicorn = pkgs.pythonPackages.gunicorn;
-  bepasty = pkgs.pythonPackages.bepasty-server;
+  bepasty = pkgs.bepasty;
   gevent = pkgs.pythonPackages.gevent;
   python = pkgs.pythonPackages.python;
   cfg = config.services.bepasty;
diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
new file mode 100644
index 000000000000..cd3a149b378d
--- /dev/null
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -0,0 +1,34 @@
+{ python
+, lib
+}:
+
+with python.pkgs;
+
+buildPythonPackage rec {
+  pname = "bepasty";
+  version = "0.4.0";
+  name = "${pname}-${version}";
+
+  propagatedBuildInputs = [
+    flask
+    pygments
+    xstatic
+    xstatic-bootbox
+    xstatic-bootstrap
+    xstatic-jquery
+    xstatic-jquery-file-upload
+    xstatic-jquery-ui
+    xstatic-pygments
+  ];
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4";
+  };
+
+  meta = {
+    homepage = http://github.com/bepasty/bepasty-server;
+    description = "Binary pastebin server";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.makefu ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 663258dec397..2629b6112e24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1228,6 +1228,8 @@ with pkgs;
     pythonPackages = python2Packages;
   };
 
+  bepasty = callPackage ../tools/misc/bepasty { };
+
   bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner;
 
   bgs = callPackage ../tools/X11/bgs { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ed3b0727494..765b36f63fae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -27380,33 +27380,6 @@ EOF
     };
   };
 
-  bepasty-server = buildPythonPackage rec {
-    name = "bepasty-server-${version}";
-    version = "0.4.0";
-    propagatedBuildInputs = with self;[
-      flask
-      pygments
-      xstatic
-      xstatic-bootbox
-      xstatic-bootstrap
-      xstatic-jquery
-      xstatic-jquery-file-upload
-      xstatic-jquery-ui
-      xstatic-pygments
-    ];
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/b/bepasty/bepasty-${version}.tar.gz";
-      sha256 = "0bs79pgrjlnkmjfyj2hllbx3rw757va5w2g2aghi9cydmsl7gyi4";
-    };
-
-    meta = {
-      homepage = http://github.com/bepasty/bepasty-server;
-      description = "Binary pastebin server";
-      license = licenses.mit;
-      maintainers = [ maintainers.makefu ];
-    };
-  };
-
   xgboost = buildPythonPackage rec {
     name = "xgboost-${version}";
 

From 63b66bf960d4e8749349bb593a776d472caaee88 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 17:53:19 +0200
Subject: [PATCH 47/75] python.pkgs.WSGIProxy: disable python3

---
 pkgs/tools/misc/bepasty/default.nix | 2 +-
 pkgs/top-level/python-packages.nix  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/bepasty/default.nix b/pkgs/tools/misc/bepasty/default.nix
index cd3a149b378d..67faf925a278 100644
--- a/pkgs/tools/misc/bepasty/default.nix
+++ b/pkgs/tools/misc/bepasty/default.nix
@@ -4,7 +4,7 @@
 
 with python.pkgs;
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   pname = "bepasty";
   version = "0.4.0";
   name = "${pname}-${version}";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 765b36f63fae..3aaea00fa24c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -26213,6 +26213,8 @@ EOF
       paste six
     ];
 
+    disabled = isPy3k; # Judging from SyntaxError
+
     meta = with stdenv.lib; {
       description = "WSGIProxy gives tools to proxy arbitrary(ish) WSGI requests to other";
       homepage = "http://pythonpaste.org/wsgiproxy/";

From 5c463017449b28f6d01762a9ec2bf0b8d92ea889 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 18:38:22 +0200
Subject: [PATCH 48/75] python.pkgs.pytest_30: keep this version

---
 .../development/python-modules/pytest/3_0.nix | 27 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  7 +++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest/3_0.nix

diff --git a/pkgs/development/python-modules/pytest/3_0.nix b/pkgs/development/python-modules/pytest/3_0.nix
new file mode 100644
index 000000000000..487fe1b73c76
--- /dev/null
+++ b/pkgs/development/python-modules/pytest/3_0.nix
@@ -0,0 +1,27 @@
+{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
+, setuptools_scm
+}:
+buildPythonPackage rec {
+  version = "3.0.7";
+  pname = "pytest";
+  name = "${pname}-${version}";
+
+  preCheck = ''
+    # don't test bash builtins
+    rm testing/test_argcomplete.py
+  '';
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "b70696ebd1a5e6b627e7e3ac1365a4bc60aaf3495e843c1e70448966c5224cab";
+  };
+
+  buildInputs = [ hypothesis setuptools_scm ];
+  propagatedBuildInputs = [ py ]
+    ++ (stdenv.lib.optional isPy26 argparse);
+
+  meta = with stdenv.lib; {
+    maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ];
+    platforms = platforms.unix;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3aaea00fa24c..4731839272ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4137,6 +4137,13 @@ in {
 
   pytest_29 = callPackage ../development/python-modules/pytest/2_9.nix {};
 
+  pytest_30 = callPackage ../development/python-modules/pytest/3_0.nix {
+    hypothesis = self.hypothesis.override {
+      # hypothesis requires pytest that causes dependency cycle
+      doCheck = false;
+      pytest = null;
+    };
+  };
   pytest_32 = callPackage ../development/python-modules/pytest{
     hypothesis = self.hypothesis.override {
       # hypothesis requires pytest that causes dependency cycle

From 61da59858c15cf88798e8ef92f94e8f9d3390a38 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 18:39:14 +0200
Subject: [PATCH 49/75] buku: python3 as parameter instead of python

---
 pkgs/applications/misc/buku/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix         | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix
index ea3ca107d24d..321e12877ebc 100644
--- a/pkgs/applications/misc/buku/default.nix
+++ b/pkgs/applications/misc/buku/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, pythonPackages, fetchFromGitHub }:
+{ stdenv, python3, fetchFromGitHub }:
 
-with pythonPackages; buildPythonApplication rec {
+with python3.pkgs; buildPythonApplication rec {
   version = "3.0"; # When updating to 3.1, make sure to remove the marked line in preCheck
   name = "buku-${version}";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2629b6112e24..f1928feb5749 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1268,9 +1268,7 @@ with pkgs;
 
   burp = callPackage ../tools/backup/burp { };
 
-  buku = callPackage ../applications/misc/buku {
-    pythonPackages = python3Packages;
-  };
+  buku = callPackage ../applications/misc/buku { };
 
   byzanz = callPackage ../applications/video/byzanz {};
 

From 10df572a034cfc92d3faddfbb4dd4cfd0afd2f42 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 18:39:49 +0200
Subject: [PATCH 50/75] python.pkgs.pytest: use fetchPypi

---
 pkgs/development/python-modules/pytest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 6e450afbef97..32ad71de7044 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, isPy26, argparse, hypothesis, py
+{ stdenv, buildPythonPackage, fetchPypi, isPy26, argparse, hypothesis, py
 , setuptools_scm
 }:
 buildPythonPackage rec {
@@ -11,8 +11,8 @@ buildPythonPackage rec {
     rm testing/test_argcomplete.py
   '';
 
-  src = fetchurl {
-    url = "mirror://pypi/p/pytest/${name}.tar.gz";
+  src = fetchPypi {
+    inherit pname version;
     sha256 = "4c2159d2be2b4e13fa293e7a72bdf2f06848a017150d5c6d35112ce51cfd74ce";
   };
 

From 34021f595dde8d9263f17aa95bcfba0ca337a33c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 18:40:25 +0200
Subject: [PATCH 51/75] python.pkgs.pytest-catchlog: disable tests

because pytest_30 is required but we don't override the package set
inside the package set.
---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4731839272ac..b0cdb3359b70 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4191,6 +4191,9 @@ in {
 
     checkPhase = "make test";
 
+    # Requires pytest < 3.1
+    doCheck = false;
+
     meta = {
       license = licenses.mit;
       homepage = https://pypi.python.org/pypi/pytest-catchlog/;

From 0081ba712d585117132af655c56ca62db8f47dc9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 18:41:00 +0200
Subject: [PATCH 52/75] python.pkgs.cgroup-utils: fix build

---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b0cdb3359b70..c48d48a2d159 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1672,6 +1672,10 @@ in {
       sha256 = "1ck0aijzrg9xf6hjdxnynkapnyxw0y385jb0q7wyq4jf77ayfszc";
     };
 
+    postPatch = ''
+      substituteInPlace setup.py --replace "argparse" ""
+    '';
+
     meta = {
       description = "Utility tools for control groups of Linux";
       maintainers = with maintainers; [ layus ];

From 78c7b40062f0b913038c25ab471e9e98011e3b0e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 19:03:14 +0200
Subject: [PATCH 53/75] python.pkgs.flask-pymong: 0.3.1 -> 0.5.1

---
 .../python-modules/Flask-PyMongo/default.nix  | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +---------
 2 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/Flask-PyMongo/default.nix

diff --git a/pkgs/development/python-modules/Flask-PyMongo/default.nix b/pkgs/development/python-modules/Flask-PyMongo/default.nix
new file mode 100644
index 000000000000..5518dc382a8b
--- /dev/null
+++ b/pkgs/development/python-modules/Flask-PyMongo/default.nix
@@ -0,0 +1,35 @@
+{ buildPythonPackage
+, fetchPypi
+, flask
+, pymongo
+, lib
+, pytest
+}:
+
+buildPythonPackage rec {
+  pname = "Flask-PyMongo";
+  name = "${pname}-${version}";
+  version = "0.5.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "2baaa2ba5107d72b3a8bd4b5c0c8881316e35340ad1ae979cc13f1f3c8843b3d";
+  };
+
+  checkInputs = [ pytest ];
+
+  checkPhase = ''
+    py.test tests
+  '';
+
+  # Tests seem to hang
+  doCheck = false;
+
+  propagatedBuildInputs = [ flask pymongo ];
+
+  meta = {
+    homepage = "http://flask-pymongo.readthedocs.org/";
+    description = "PyMongo support for Flask applications";
+    license = lib.licenses.bsd2;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c48d48a2d159..30d3129b8941 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9853,23 +9853,7 @@ in {
     };
   };
 
-  flask-pymongo = buildPythonPackage rec {
-    name = "Flask-PyMongo-${version}";
-    version = "0.3.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/F/Flask-PyMongo/${name}.tar.gz";
-      sha256 = "0305qngvjrjyyabf8gxqgqvd9ffh00gr5yfrjf4nncr2my9svbyd";
-    };
-
-    propagatedBuildInputs = with self; [ flask pymongo_2_9_1 ];
-
-    meta = {
-      homepage = "http://flask-pymongo.readthedocs.org/";
-      description = "PyMongo support for Flask applications";
-      license = licenses.bsd2;
-    };
-  };
+  flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { };
 
   flask-restful = buildPythonPackage rec {
     name = "Flask-RESTful-${version}";

From 2923300a5fdf41ef4620f7f33355df7118920263 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 19:03:41 +0200
Subject: [PATCH 54/75] python.pkgs.sqlalchemy: use pytest_30 and don't use
 pytest_xdist

---
 .../python-modules/sqlalchemy/default.nix          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index a6fefaa16121..27a3c4ac2ae3 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -1,7 +1,7 @@
 { lib
 , fetchPypi
 , buildPythonPackage
-, pytest
+, pytest_30
 , mock
 , pytest_xdist
 , isPy3k
@@ -18,12 +18,12 @@ buildPythonPackage rec {
     sha256 = "2a98ac87b30eaa2bee1f1044848b9590e476e7f93d033c6542e60b993a5cf898";
   };
 
-  checkInputs = [ pytest mock pytest_xdist ]
-    ++ lib.optional (!isPy3k) pysqlite;
-
-  # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
-  # acceptable reason to make all dependents unavailable on Python 3 as well
-  #doCheck = !(isPyPy || isPy3k);
+  checkInputs = [
+    pytest_30
+    mock
+#     Disable pytest_xdist tests for now, because our version seems to be too new.
+#     pytest_xdist
+  ] ++ lib.optional (!isPy3k) pysqlite;
 
   checkPhase = ''
     py.test

From 7726a1ec25854e85aee988111fae83d767a5b179 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 25 Aug 2017 19:34:14 +0200
Subject: [PATCH 55/75] python.pkgs.sphinxcontrib-websupport: init at 1.0.1

---
 .../sphinxcontrib-websupport/default.nix      | 26 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinxcontrib-websupport/default.nix

diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
new file mode 100644
index 000000000000..fa308dc37bb0
--- /dev/null
+++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix
@@ -0,0 +1,26 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, six
+}:
+
+buildPythonPackage rec {
+  pname = "sphinxcontrib-websupport";
+  version = "1.0.1";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "7a85961326aa3a400cd4ad3c816d70ed6f7c740acd7ce5d78cd0a67825072eb9";
+  };
+
+  propagatedBuildInputs = [ six ];
+
+  doCheck = false;
+
+  meta = {
+    description = "Sphinx API for Web Apps";
+    homepage = http://sphinx-doc.org/;
+    license = lib.licenses.bsd2;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 30d3129b8941..ff0edb75b444 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22121,6 +22121,8 @@ in {
     doCheck = false;
   };
 
+  sphinxcontrib-websupport = callPackage ../development/python-modules/sphinxcontrib-websupport { };
+
   hieroglyph = callPackage ../development/python-modules/hieroglyph { };
 
   sphinx_rtd_theme = buildPythonPackage (rec {

From a470be5a16e54ebdda7d1e61ca1e74f82aed3199 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 16:39:15 -0400
Subject: [PATCH 56/75] expand-response-params: Build more normally

---
 pkgs/build-support/cc-wrapper/default.nix        |  3 ++-
 pkgs/build-support/cc-wrapper/utils.sh           |  2 +-
 .../expand-response-params/default.nix           | 16 +++++++++++-----
 pkgs/stdenv/linux/default.nix                    |  2 +-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index d5ae64c9c5ff..bb95c1807ab9 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -342,7 +342,8 @@ stdenv.mkDerivation {
 
   inherit dynamicLinker expand-response-params;
 
-  expandResponseParams = expand-response-params; # for substitution in utils.sh
+  # for substitution in utils.sh
+  expandResponseParams = "${expand-response-params}/bin/expand-response-params";
 
   crossAttrs = {
     shell = shell.crossDrv + shell.crossDrv.shellPath;
diff --git a/pkgs/build-support/cc-wrapper/utils.sh b/pkgs/build-support/cc-wrapper/utils.sh
index 7e9979f10ae8..c84a094e26b0 100644
--- a/pkgs/build-support/cc-wrapper/utils.sh
+++ b/pkgs/build-support/cc-wrapper/utils.sh
@@ -30,7 +30,7 @@ expandResponseParams() {
         if [[ "$arg" == @* ]]; then
             # phase separation makes this look useless
             # shellcheck disable=SC2157
-            if [ -n "@expandResponseParams@" ]; then
+            if [ -x "@expandResponseParams@" ]; then
                 # params is used by caller
                 #shellcheck disable=SC2034
                 readarray -d '' params < <("@expandResponseParams@" "$@")
diff --git a/pkgs/build-support/expand-response-params/default.nix b/pkgs/build-support/expand-response-params/default.nix
index 7afbb727fc3e..2a4bee74197b 100644
--- a/pkgs/build-support/expand-response-params/default.nix
+++ b/pkgs/build-support/expand-response-params/default.nix
@@ -3,11 +3,17 @@
 stdenv.mkDerivation {
   name = "expand-response-params";
   src = ./expand-response-params.c;
-  buildCommand = ''
-    # Work around "stdenv-darwin-boot-2 is not allowed to refer to path /nix/store/...-expand-response-params.c"
+  # Work around "stdenv-darwin-boot-2 is not allowed to refer to path
+  # /nix/store/...-expand-response-params.c"
+  unpackPhase = ''
     cp "$src" expand-response-params.c
-    "$CC" -std=c99 -O3 -o "$out" expand-response-params.c
-    strip -S $out
-    ${stdenv.lib.optionalString stdenv.hostPlatform.isLinux "patchelf --shrink-rpath $out"}
+    src=$PWD
+  '';
+  buildPhase = ''
+    "$CC" -std=c99 -O3 -o "expand-response-params" expand-response-params.c
+  '';
+  installPhase = ''
+    mkdir -p $prefix/bin
+    mv expand-response-params $prefix/bin/
   '';
 }
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 48deb9a5c02c..fab1985b9765 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -310,7 +310,7 @@ in
         # More complicated cases
         ++ [
             glibc.out glibc.dev glibc.bin/*propagated from .dev*/ linuxHeaders
-            gcc gcc.cc gcc.cc.lib gcc.expandResponseParams
+            gcc gcc.cc gcc.cc.lib gcc.expand-response-params
           ]
           ++ lib.optionals (system == "aarch64-linux")
             [ prevStage.updateAutotoolsGnuConfigScriptsHook prevStage.gnu-config ];

From dc47e763c15b54ece609e08d0496462a11862cd6 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 17:30:56 -0400
Subject: [PATCH 57/75] cc-wrapper: Use `set -u` for better maintainability

---
 pkgs/build-support/cc-wrapper/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index bb95c1807ab9..696e43369a7a 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -114,6 +114,8 @@ stdenv.mkDerivation {
 
   buildCommand =
     ''
+      set -u
+
       mkdir -p $out/bin $out/nix-support $man/nix-support
 
       wrap() {
@@ -320,7 +322,7 @@ stdenv.mkDerivation {
       rm $out/nix-support/setup-hook.tmp
 
       # some linkers on some platforms don't support specific -z flags
-      hardening_unsupported_flags=""
+      export hardening_unsupported_flags=""
       if [[ "$($ldPath/${prefix}ld -z now 2>&1 || true)" =~ un(recognized|known)\ option ]]; then
         hardening_unsupported_flags+=" bindnow"
       fi

From df7c305c4cba1c69f61086be64ff9bbdacb5a31b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 23 Aug 2017 16:55:55 -0400
Subject: [PATCH 58/75] cc-wrapper: Leverage the setup script instead of
 `buildCommand`

---
 pkgs/build-support/cc-wrapper/default.nix | 225 +++++++++++++---------
 1 file changed, 132 insertions(+), 93 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 696e43369a7a..0114170b8ebc 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -112,7 +112,14 @@ stdenv.mkDerivation {
     '';
   };
 
-  buildCommand =
+  dontBuild = true;
+  dontConfigure = true;
+
+  unpackPhase = ''
+    src=$PWD
+  '';
+
+  installPhase =
     ''
       set -u
 
@@ -127,103 +134,16 @@ stdenv.mkDerivation {
       }
     ''
 
-    + optionalString (libc != null) (''
-      if [[ -z ''${dynamicLinker+x} ]]; then
-        echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2
-        dynamicLinker="${libc_lib}/lib/ld*.so.?"
-      fi
-
-      # Expand globs to fill array of options
-      dynamicLinker=($dynamicLinker)
-
-      case ''${#dynamicLinker[@]} in
-        0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;;
-        1) echo "Using dynamic linker: '$dynamicLinker'" >&2;;
-        *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
-      esac
-
-      if [ -n "$dynamicLinker" ]; then
-        echo $dynamicLinker > $out/nix-support/dynamic-linker
-
-    '' + (if targetPlatform.isDarwin then ''
-        printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
-    '' else ''
-        if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
-          echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
-        fi
-
-        ldflagsBefore=(-dynamic-linker "$dynamicLinker")
-    '') + ''
-      fi
-
-      # The dynamic linker is passed in `ldflagsBefore' to allow
-      # explicit overrides of the dynamic linker by callers to gcc/ld
-      # (the *last* value counts, so ours should come first).
-      printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
-    '')
-
-    + optionalString (libc != null) ''
-      # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
-      # against the crt1.o from our own glibc, rather than the one in
-      # /usr/lib.  (This is only an issue when using an `impure'
-      # compiler/linker, i.e., one that searches /usr/lib and so on.)
-      #
-      # Unfortunately, setting -B appears to override the default search
-      # path. Thus, the gcc-specific "../includes-fixed" directory is
-      # now longer searched and glibc's <limits.h> header fails to
-      # compile, because it uses "#include_next <limits.h>" to find the
-      # limits.h file in ../includes-fixed. To remedy the problem,
-      # another -idirafter is necessary to add that directory again.
-      echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
-
-      echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
-
-      echo "${libc_lib}" > $out/nix-support/orig-libc
-      echo "${libc_dev}" > $out/nix-support/orig-libc-dev
-    ''
-
     + (if nativeTools then ''
+      echo ${if targetPlatform.isDarwin then cc else nativePrefix} > $out/nix-support/orig-cc
+
       ccPath="${if targetPlatform.isDarwin then cc else nativePrefix}/bin"
       ldPath="${nativePrefix}/bin"
     '' else ''
       echo $cc > $out/nix-support/orig-cc
 
-      # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
-      # ${cc_solib}/lib64 (even though it does actually search there...)..
-      # This confuses libtool.  So add it to the compiler tool search
-      # path explicitly.
-      if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
-        ccLDFlags+=" -L${cc_solib}/lib64"
-        ccCFlags+=" -B${cc_solib}/lib64"
-      fi
-      ccLDFlags+=" -L${cc_solib}/lib"
-      ccCFlags+=" -B${cc_solib}/lib"
-
-      ${optionalString cc.langVhdl or false ''
-        ccLDFlags+=" -L${zlib.out}/lib"
-      ''}
-
-      # Find the gcc libraries path (may work only without multilib).
-      ${optionalString cc.langAda or false ''
-        basePath=`echo ${cc_solib}/lib/*/*/*`
-        ccCFlags+=" -B$basePath -I$basePath/adainclude"
-        gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
-        echo "$gnatCFlags" > $out/nix-support/gnat-cflags
-      ''}
-
-      echo "$ccLDFlags" > $out/nix-support/cc-ldflags
-      echo "$ccCFlags" > $out/nix-support/cc-cflags
-
       ccPath="${cc}/bin"
       ldPath="${binutils_bin}/bin"
-
-      # Propagate the wrapped cc so that if you install the wrapper,
-      # you get tools like gcov, the manpages, etc. as well (including
-      # for binutils and Glibc).
-      printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
-      printWords ${cc.man or ""}  > $man/nix-support/propagated-user-env-packages
-
-      printWords ${toString extraPackages} > $out/nix-support/propagated-native-build-inputs
     ''
 
     + optionalString (targetPlatform.isSunOS && nativePrefix != "") ''
@@ -314,12 +234,126 @@ stdenv.mkDerivation {
 
     + optionalString cc.langVhdl or false ''
       ln -s $ccPath/${prefix}ghdl $out/bin/${prefix}ghdl
+    '';
+
+  propagatedBuildInputs = extraPackages;
+
+  setupHook = ./setup-hook.sh;
+
+  postFixup =
+    ''
+      set -u
+    ''
+
+    + optionalString (libc != null) (''
+      ##
+      ## General libc support
+      ##
+
+      # The "-B${libc_lib}/lib/" flag is a quick hack to force gcc to link
+      # against the crt1.o from our own glibc, rather than the one in
+      # /usr/lib.  (This is only an issue when using an `impure'
+      # compiler/linker, i.e., one that searches /usr/lib and so on.)
+      #
+      # Unfortunately, setting -B appears to override the default search
+      # path. Thus, the gcc-specific "../includes-fixed" directory is
+      # now longer searched and glibc's <limits.h> header fails to
+      # compile, because it uses "#include_next <limits.h>" to find the
+      # limits.h file in ../includes-fixed. To remedy the problem,
+      # another -idirafter is necessary to add that directory again.
+      echo "-B${libc_lib}/lib/ -idirafter ${libc_dev}/include -idirafter ${cc}/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags
+
+      echo "-L${libc_lib}/lib" > $out/nix-support/libc-ldflags
+
+      echo "${libc_lib}" > $out/nix-support/orig-libc
+      echo "${libc_dev}" > $out/nix-support/orig-libc-dev
+
+      ##
+      ## Dynamic linker support
+      ##
+
+      if [[ -z ''${dynamicLinker+x} ]]; then
+        echo "Don't know the name of the dynamic linker for platform '${targetPlatform.config}', so guessing instead." >&2
+        local dynamicLinker="${libc_lib}/lib/ld*.so.?"
+      fi
+
+      # Expand globs to fill array of options
+      dynamicLinker=($dynamicLinker)
+
+      case ''${#dynamicLinker[@]} in
+        0) echo "No dynamic linker found for platform '${targetPlatform.config}'." >&2;;
+        1) echo "Using dynamic linker: '$dynamicLinker'" >&2;;
+        *) echo "Multiple dynamic linkers found for platform '${targetPlatform.config}'." >&2;;
+      esac
+
+      if [ -n "$dynamicLinker" ]; then
+        echo $dynamicLinker > $out/nix-support/dynamic-linker
+
+    '' + (if targetPlatform.isDarwin then ''
+        printf "export LD_DYLD_PATH=%q\n" "$dynamicLinker" >> $out/nix-support/setup-hook
+    '' else ''
+        if [ -e ${libc_lib}/lib/32/ld-linux.so.2 ]; then
+          echo ${libc_lib}/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32
+        fi
+
+        local ldflagsBefore=(-dynamic-linker "$dynamicLinker")
+    '') + ''
+      fi
+
+      # The dynamic linker is passed in `ldflagsBefore' to allow
+      # explicit overrides of the dynamic linker by callers to gcc/ld
+      # (the *last* value counts, so ours should come first).
+      printWords "''${ldflagsBefore[@]}" > $out/nix-support/libc-ldflags-before
+    '')
+
+    + optionalString (!nativeTools) ''
+
+      ##
+      ## Initial CFLAGS
+      ##
+
+      # GCC shows ${cc_solib}/lib in `gcc -print-search-dirs', but not
+      # ${cc_solib}/lib64 (even though it does actually search there...)..
+      # This confuses libtool.  So add it to the compiler tool search
+      # path explicitly.
+      if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then
+        ccLDFlags+=" -L${cc_solib}/lib64"
+        ccCFlags+=" -B${cc_solib}/lib64"
+      fi
+      ccLDFlags+=" -L${cc_solib}/lib"
+      ccCFlags+=" -B${cc_solib}/lib"
+
+      ${optionalString cc.langVhdl or false ''
+        ccLDFlags+=" -L${zlib.out}/lib"
+      ''}
+
+      # Find the gcc libraries path (may work only without multilib).
+      ${optionalString cc.langAda or false ''
+        basePath=`echo ${cc_solib}/lib/*/*/*`
+        ccCFlags+=" -B$basePath -I$basePath/adainclude"
+        gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
+        echo "$gnatCFlags" > $out/nix-support/gnat-cflags
+      ''}
+
+      echo "$ccLDFlags" > $out/nix-support/cc-ldflags
+      echo "$ccCFlags" > $out/nix-support/cc-cflags
+
+      ##
+      ## User env support
+      ##
+
+      # Propagate the wrapped cc so that if you install the wrapper,
+      # you get tools like gcov, the manpages, etc. as well (including
+      # for binutils and Glibc).
+      printWords ${cc} ${binutils_bin} ${if libc == null then "" else libc_bin} > $out/nix-support/propagated-user-env-packages
+      printWords ${cc.man or ""}  > $man/nix-support/propagated-user-env-packages
     ''
 
     + ''
-      substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook.tmp
-      cat $out/nix-support/setup-hook.tmp >> $out/nix-support/setup-hook
-      rm $out/nix-support/setup-hook.tmp
+
+      ##
+      ## Hardening support
+      ##
 
       # some linkers on some platforms don't support specific -z flags
       export hardening_unsupported_flags=""
@@ -339,6 +373,11 @@ stdenv.mkDerivation {
       substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh
       substituteAll ${./add-hardening.sh} $out/nix-support/add-hardening.sh
       substituteAll ${./utils.sh} $out/nix-support/utils.sh
+
+      ##
+      ## Extra custom steps
+      ##
+
     ''
     + extraBuildCommands;
 

From ee51e73120f5da4b1fa524dc0b0fd91f565be1e7 Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Thu, 17 Aug 2017 17:13:13 +0000
Subject: [PATCH 59/75] perl: 5.24.1 -> 5.24.2 and 5.22.3 -> 5.22.4

Scavenged by vcunat from #28353.
---
 pkgs/development/interpreters/perl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 5654aefe5d29..e268cfb7ea65 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -125,13 +125,13 @@ in rec {
   perl = perl524;
 
   perl522 = common {
-    version = "5.22.3";
-    sha256 = "10q087l1ffdy3gpryr8z540jcnsr0dhm37raicyfqqkyvys1yd8v";
+    version = "5.22.4";
+    sha256 = "1yk1xn4wmnrf2ph02j28khqarpyr24qwysjzkjnjv7vh5dygb7ms";
   };
 
   perl524 = common {
-    version = "5.24.1";
-    sha256 = "1bqqb5ghfj4486nqr77kgsd8aff6a289jy7n2cdkznwvn34qbhg6";
+    version = "5.24.2";
+    sha256 = "1x4yj814a79lcarwb3ab6bbcb36hvb5n4ph4zg3yb0nabsjfi6v0";
   };
 
 }

From dfd905b548e943f31eac36d487089116c2af10fb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 27 Aug 2017 19:56:39 +0200
Subject: [PATCH 60/75] python.pkgs.sphinx: fix python < 3.5 build

---
 pkgs/development/python-modules/sphinx/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 605ab3b3a602..a96a31824f78 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -21,6 +21,7 @@
 , imagesize
 , requests
 , sphinxcontrib-websupport
+, typing
 }:
 
 buildPythonPackage rec {
@@ -52,7 +53,7 @@ buildPythonPackage rec {
     imagesize
     requests
     sphinxcontrib-websupport
-  ];
+  ] ++ lib.optional (pythonOlder "3.5") typing;
 
   # Lots of tests. Needs network as well at some point.
   doCheck = false;

From ccbdab96d436497e084be1f6d26460f13dee676b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 27 Aug 2017 20:29:52 +0200
Subject: [PATCH 61/75] ed: 1.14.1 -> 1.14.2

---
 pkgs/applications/editors/ed/default.nix | 28 ++++++++----------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index 2404405c307f..9d5848f02637 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,26 +1,20 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, lzip
 , buildPlatform, hostPlatform
 }:
 
 stdenv.mkDerivation rec {
   name = "ed-${version}";
-  version = "1.14.1";
+  version = "1.14.2";
 
   src = fetchurl {
-    # gnu only provides *.lz tarball, which is unfriendly for stdenv bootstrapping
-    #url = "mirror://gnu/ed/${name}.tar.gz";
-    # When updating, please make sure the sources pulled match those upstream by
-    # Unpacking both tarballs and running `find . -type f -exec sha256sum \{\} \; | sha256sum`
-    # in the resulting directory
-    urls = let file_sha512 = "84396fe4e4f0bf0b591037277ff8679a08b2883207628aaa387644ad83ca5fbdaa74a581f33310e28222d2fea32a0b8ba37e579597cc7d6145df6eb956ea75db";
-      in [
-        ("http://pkgs.fedoraproject.org/repo/extras/ed"
-          + "/${name}.tar.bz2/sha512/${file_sha512}/${name}.tar.bz2")
-        "http://fossies.org/linux/privat/${name}.tar.bz2"
-      ];
-    sha256 = "1pk6qa4sr7qc6vgm34hjx44hsh8x2bwaxhdi78jhsacnn4zwi7bw";
+    url = "mirror://gnu/ed/${name}.tar.lz";
+    sha256 = "1nqhk3n1s1p77g2bjnj55acicsrlyb2yasqxqwpx0w0djfx64ygm";
   };
 
+  unpackCmd = "tar --lzip -xf";
+
+  nativeBuildInputs = [ lzip ];
+
   /* FIXME: Tests currently fail on Darwin:
 
        building test scripts for ed-1.5...
@@ -32,11 +26,7 @@ stdenv.mkDerivation rec {
     */
   doCheck = !(hostPlatform.isDarwin || hostPlatform != buildPlatform);
 
-  # TODO(@Ericson2314): Use placeholder to make this a configure flag once Nix
-  # 1.12 is released.
-  preConfigure = ''
-    export DESTDIR=$out
-  '';
+  installFlags = [ "DESTDIR=$(out)" ];
 
   configureFlags = [
     "--exec-prefix=${stdenv.cc.prefix}"

From 6a851869b4d763654851d9b1dcd96ff1af0c6792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 27 Aug 2017 22:09:52 +0200
Subject: [PATCH 62/75] libdrm: 2.4.82 -> 2.4.83

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

diff --git a/pkgs/development/libraries/libdrm/default.nix b/pkgs/development/libraries/libdrm/default.nix
index 96d346ad77ec..c62d31a1e26a 100644
--- a/pkgs/development/libraries/libdrm/default.nix
+++ b/pkgs/development/libraries/libdrm/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libpthreadstubs, libpciaccess, valgrind-light }:
 
 stdenv.mkDerivation rec {
-  name = "libdrm-2.4.82";
+  name = "libdrm-2.4.83";
 
   src = fetchurl {
     url = "http://dri.freedesktop.org/libdrm/${name}.tar.bz2";
-    sha256 = "43fa2dbd422d6d41ac141272cc9855360ce4d08c7cf7f2c7bb55dfe449c4ce1c";
+    sha256 = "1minzvsyz5hgm6ixpj8ysa6jsv7vm8qc8nx390jxdsk0v9ljd983";
   };
 
   outputs = [ "out" "dev" ];

From aa1e535b1be7ecba807244ce90f5a1d4b2c492cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 27 Aug 2017 22:14:43 +0200
Subject: [PATCH 63/75] mesa: maintenance 17.1.6 -> 17.1.7

---
 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 f23838cb9565..54e5626868a0 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -67,7 +67,7 @@ let
 in
 
 let
-  version = "17.1.6";
+  version = "17.1.7";
   branch  = head (splitString "." version);
   driverLink = "/run/opengl-driver" + optionalString stdenv.isi686 "-32";
 in
@@ -82,7 +82,7 @@ stdenv.mkDerivation {
       "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz"
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50";
+    sha256 = "1xg5v61nvabjk3rx48cwmnwv6zpqdcnkxl8bz82284mifjl75x39";
   };
 
   prePatch = "patchShebangs .";

From a7ddca6e3dce865a6a07cbdaea3963026b7bb3d3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 28 Aug 2017 09:42:59 +0200
Subject: [PATCH 64/75] python 3.4, 3.5, 3.6: Don't use ldconfig and speed up
 uuid load, fixes #28349

These patches had already been merged for 3.5 and 3.6 but not yet for
3.4. However, they did contain a mistake as explained in #28349.
---
 .../python/cpython/3.4/default.nix            |   4 +
 .../python/cpython/3.4/no-ldconfig.patch      | 147 ++++++++++++++++++
 .../python/cpython/3.5/no-ldconfig.patch      |  20 +--
 .../python/cpython/3.6/no-ldconfig.patch      |  20 +--
 4 files changed, 171 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch

diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index 5799e319ba04..d00b91f316ff 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -64,6 +64,10 @@ in stdenv.mkDerivation {
     substituteInPlace configure --replace '-Wl,-stack_size,1000000' ' '
   '';
 
+  patches = [
+    ./no-ldconfig.patch
+  ];
+
   postPatch = ''
     # Determinism
     substituteInPlace "Lib/py_compile.py" --replace "source_stats['mtime']" "(1 if 'DETERMINISTIC_BUILD' in os.environ else source_stats['mtime'])"
diff --git a/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
new file mode 100644
index 000000000000..3cb77a107254
--- /dev/null
+++ b/pkgs/development/interpreters/python/cpython/3.4/no-ldconfig.patch
@@ -0,0 +1,147 @@
+From 81bd99ad9058feb1d0361bc8862e8567c21a6142 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <fridh@fridh.nl>
+Date: Mon, 28 Aug 2017 09:24:06 +0200
+Subject: [PATCH] Don't use ldconfig and speed up uuid load
+
+---
+ Lib/ctypes/util.py | 52 ++--------------------------------------------------
+ Lib/uuid.py        | 50 ++------------------------------------------------
+ 2 files changed, 4 insertions(+), 98 deletions(-)
+
+diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
+index 595113bffd..780cd5d21b 100644
+--- a/Lib/ctypes/util.py
++++ b/Lib/ctypes/util.py
+@@ -88,28 +88,7 @@ elif os.name == "posix":
+     import re, tempfile
+ 
+     def _findLib_gcc(name):
+-        expr = r'[^\(\)\s]*lib%s\.[^\(\)\s]*' % re.escape(name)
+-        fdout, ccout = tempfile.mkstemp()
+-        os.close(fdout)
+-        cmd = 'if type gcc >/dev/null 2>&1; then CC=gcc; elif type cc >/dev/null 2>&1; then CC=cc;else exit 10; fi;' \
+-              'LANG=C LC_ALL=C $CC -Wl,-t -o ' + ccout + ' 2>&1 -l' + name
+-        try:
+-            f = os.popen(cmd)
+-            try:
+-                trace = f.read()
+-            finally:
+-                rv = f.close()
+-        finally:
+-            try:
+-                os.unlink(ccout)
+-            except FileNotFoundError:
+-                pass
+-        if rv == 10:
+-            raise OSError('gcc or cc command not found')
+-        res = re.search(expr, trace)
+-        if not res:
+-            return None
+-        return res.group(0)
++        return None
+ 
+ 
+     if sys.platform == "sunos5":
+@@ -200,34 +179,7 @@ elif os.name == "posix":
+     else:
+ 
+         def _findSoname_ldconfig(name):
+-            import struct
+-            if struct.calcsize('l') == 4:
+-                machine = os.uname().machine + '-32'
+-            else:
+-                machine = os.uname().machine + '-64'
+-            mach_map = {
+-                'x86_64-64': 'libc6,x86-64',
+-                'ppc64-64': 'libc6,64bit',
+-                'sparc64-64': 'libc6,64bit',
+-                's390x-64': 'libc6,64bit',
+-                'ia64-64': 'libc6,IA-64',
+-                }
+-            abi_type = mach_map.get(machine, 'libc6')
+-
+-            # XXX assuming GLIBC's ldconfig (with option -p)
+-            regex = os.fsencode(
+-                '\s+(lib%s\.[^\s]+)\s+\(%s' % (re.escape(name), abi_type))
+-            try:
+-                with subprocess.Popen(['/sbin/ldconfig', '-p'],
+-                                      stdin=subprocess.DEVNULL,
+-                                      stderr=subprocess.DEVNULL,
+-                                      stdout=subprocess.PIPE,
+-                                      env={'LC_ALL': 'C', 'LANG': 'C'}) as p:
+-                    res = re.search(regex, p.stdout.read())
+-                    if res:
+-                        return os.fsdecode(res.group(1))
+-            except OSError:
+-                pass
++            return None
+ 
+         def find_library(name):
+             return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
+diff --git a/Lib/uuid.py b/Lib/uuid.py
+index 1061bffc43..846f5819f5 100644
+--- a/Lib/uuid.py
++++ b/Lib/uuid.py
+@@ -451,57 +451,11 @@ def _netbios_getnode():
+         return ((bytes[0]<<40) + (bytes[1]<<32) + (bytes[2]<<24) +
+                 (bytes[3]<<16) + (bytes[4]<<8) + bytes[5])
+ 
+-# Thanks to Thomas Heller for ctypes and for his help with its use here.
+ 
+-# If ctypes is available, use it to find system routines for UUID generation.
+-# XXX This makes the module non-thread-safe!
+ _uuid_generate_random = _uuid_generate_time = _UuidCreate = None
+-try:
+-    import ctypes, ctypes.util
+ 
+-    # The uuid_generate_* routines are provided by libuuid on at least
+-    # Linux and FreeBSD, and provided by libc on Mac OS X.
+-    for libname in ['uuid', 'c']:
+-        try:
+-            lib = ctypes.CDLL(ctypes.util.find_library(libname))
+-        except:
+-            continue
+-        if hasattr(lib, 'uuid_generate_random'):
+-            _uuid_generate_random = lib.uuid_generate_random
+-        if hasattr(lib, 'uuid_generate_time'):
+-            _uuid_generate_time = lib.uuid_generate_time
+-            if _uuid_generate_random is not None:
+-                break  # found everything we were looking for
+-
+-    # The uuid_generate_* functions are broken on MacOS X 10.5, as noted
+-    # in issue #8621 the function generates the same sequence of values
+-    # in the parent process and all children created using fork (unless
+-    # those children use exec as well).
+-    #
+-    # Assume that the uuid_generate functions are broken from 10.5 onward,
+-    # the test can be adjusted when a later version is fixed.
+-    import sys
+-    if sys.platform == 'darwin':
+-        import os
+-        if int(os.uname().release.split('.')[0]) >= 9:
+-            _uuid_generate_random = _uuid_generate_time = None
+-
+-    # On Windows prior to 2000, UuidCreate gives a UUID containing the
+-    # hardware address.  On Windows 2000 and later, UuidCreate makes a
+-    # random UUID and UuidCreateSequential gives a UUID containing the
+-    # hardware address.  These routines are provided by the RPC runtime.
+-    # NOTE:  at least on Tim's WinXP Pro SP2 desktop box, while the last
+-    # 6 bytes returned by UuidCreateSequential are fixed, they don't appear
+-    # to bear any relationship to the MAC address of any network device
+-    # on the box.
+-    try:
+-        lib = ctypes.windll.rpcrt4
+-    except:
+-        lib = None
+-    _UuidCreate = getattr(lib, 'UuidCreateSequential',
+-                          getattr(lib, 'UuidCreate', None))
+-except:
+-    pass
++_uuid_generate_time = _UuidCreate = None
++
+ 
+ def _unixdll_getnode():
+     """Get the hardware address on Unix using ctypes."""
+-- 
+2.14.1
+
diff --git a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
index c96de5d0e914..9718b1d8dceb 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
+++ b/pkgs/development/interpreters/python/cpython/3.5/no-ldconfig.patch
@@ -1,12 +1,12 @@
-From f0ed87f4066296b7aa3c095d04672c138506fa45 Mon Sep 17 00:00:00 2001
+From 590c46bb04f79ab611b2f8fd682dd7e43a01f268 Mon Sep 17 00:00:00 2001
 From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Sat, 29 Jul 2017 20:33:56 +0200
+Date: Mon, 28 Aug 2017 09:24:06 +0200
 Subject: [PATCH] Don't use ldconfig and speed up uuid load
 
 ---
  Lib/ctypes/util.py | 70 ++----------------------------------------------------
- Lib/uuid.py        | 52 ----------------------------------------
- 2 files changed, 2 insertions(+), 120 deletions(-)
+ Lib/uuid.py        | 49 --------------------------------------
+ 2 files changed, 2 insertions(+), 117 deletions(-)
 
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
 index 7684eab81d..e9957d7951 100644
@@ -97,22 +97,22 @@ index 7684eab81d..e9957d7951 100644
          def find_library(name):
              return _findSoname_ldconfig(name) or _get_soname(_findLib_gcc(name))
 diff --git a/Lib/uuid.py b/Lib/uuid.py
-index e96e7e034c..a099ab4b4a 100644
+index e96e7e034c..31160ace95 100644
 --- a/Lib/uuid.py
 +++ b/Lib/uuid.py
-@@ -455,58 +455,6 @@ def _netbios_getnode():
+@@ -455,58 +455,9 @@ def _netbios_getnode():
              continue
          return int.from_bytes(bytes, 'big')
  
 -# Thanks to Thomas Heller for ctypes and for his help with its use here.
--
+ 
 -# If ctypes is available, use it to find system routines for UUID generation.
 -# XXX This makes the module non-thread-safe!
--_uuid_generate_time = _UuidCreate = None
+ _uuid_generate_time = _UuidCreate = None
 -try:
 -    import ctypes, ctypes.util
 -    import sys
--
+ 
 -    # The uuid_generate_* routines are provided by libuuid on at least
 -    # Linux and FreeBSD, and provided by libc on Mac OS X.
 -    _libnames = ['uuid']
@@ -160,5 +160,5 @@ index e96e7e034c..a099ab4b4a 100644
  def _unixdll_getnode():
      """Get the hardware address on Unix using ctypes."""
 -- 
-2.13.3
+2.14.1
 
diff --git a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
index da6afe04d6e7..0f829860a5b7 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
+++ b/pkgs/development/interpreters/python/cpython/3.6/no-ldconfig.patch
@@ -1,12 +1,12 @@
-From a831df344ec1c883a0ef04d8cc8f5c53a942f6de Mon Sep 17 00:00:00 2001
+From 105621b99cc30615c79b5aa3d12d6732e14b0d59 Mon Sep 17 00:00:00 2001
 From: Frederik Rietdijk <fridh@fridh.nl>
-Date: Sat, 29 Jul 2017 20:17:40 +0200
+Date: Mon, 28 Aug 2017 09:24:06 +0200
 Subject: [PATCH] Don't use ldconfig and speed up uuid load
 
 ---
  Lib/ctypes/util.py | 70 ++----------------------------------------------------
- Lib/uuid.py        | 51 ---------------------------------------
- 2 files changed, 2 insertions(+), 119 deletions(-)
+ Lib/uuid.py        | 48 -------------------------------------
+ 2 files changed, 2 insertions(+), 116 deletions(-)
 
 diff --git a/Lib/ctypes/util.py b/Lib/ctypes/util.py
 index 339ae8aa8a..2944985c30 100644
@@ -97,22 +97,22 @@ index 339ae8aa8a..2944985c30 100644
          def _findLib_ld(name):
              # See issue #9998 for why this is needed
 diff --git a/Lib/uuid.py b/Lib/uuid.py
-index 200c800b34..a099ab4b4a 100644
+index 200c800b34..31160ace95 100644
 --- a/Lib/uuid.py
 +++ b/Lib/uuid.py
-@@ -455,57 +455,6 @@ def _netbios_getnode():
+@@ -455,57 +455,9 @@ def _netbios_getnode():
              continue
          return int.from_bytes(bytes, 'big')
  
 -# Thanks to Thomas Heller for ctypes and for his help with its use here.
--
+ 
 -# If ctypes is available, use it to find system routines for UUID generation.
 -# XXX This makes the module non-thread-safe!
--_uuid_generate_time = _UuidCreate = None
+ _uuid_generate_time = _UuidCreate = None
 -try:
 -    import ctypes, ctypes.util
 -    import sys
--
+ 
 -    # The uuid_generate_* routines are provided by libuuid on at least
 -    # Linux and FreeBSD, and provided by libc on Mac OS X.
 -    _libnames = ['uuid']
@@ -159,5 +159,5 @@ index 200c800b34..a099ab4b4a 100644
  def _unixdll_getnode():
      """Get the hardware address on Unix using ctypes."""
 -- 
-2.13.3
+2.14.1
 

From 94351197cd40d7e2d22e8a971e888b8333764cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@sourcediver.org>
Date: Thu, 24 Aug 2017 17:38:28 +0200
Subject: [PATCH 65/75] cpython: include test.support and test.regrtest

test.{support, regrtest} are the internal packages cpython
developers use to write tests.
Although they are not public and the API may change/break
some developers use these packages to write tests for their
(3rd party) software.
The derivations for cpython now only remove the actual tests
but leave the packages in place that are used to write them.

Discussion: https://github.com/NixOS/nixpkgs/pull/28540
---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 3 ++-
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 5 ++++-
 pkgs/development/interpreters/python/cpython/3.5/default.nix | 5 ++++-
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 5 ++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index fd3c63de1e72..f601fbc98085 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -162,7 +162,8 @@ in stdenv.mkDerivation {
         # needed for some packages, especially packages that backport
         # functionality to 2.x from 3.x
         for item in $out/lib/python${majorVersion}/test/*; do
-          if [[ "$item" != */test_support.py* ]]; then
+          if [[ "$item" != */test_support.py*
+             && "$item" != */regrtest.py* ]]; then
             rm -rf "$item"
           else
             echo $item
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index d00b91f316ff..3b375e147bce 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -111,7 +111,10 @@ in stdenv.mkDerivation {
     # needed for some packages, especially packages that backport functionality
     # to 2.x from 3.x
     for item in $out/lib/python${majorVersion}/test/*; do
-      if [[ "$item" != */test_support.py* ]]; then
+      if [[ "$item" != */test_support.py*
+         && "$item" != */test/support
+         && "$item" != */test/libregrtest
+         && "$item" != */test/regrtest.py* ]]; then
         rm -rf "$item"
       else
         echo $item
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 1b71dba42c41..ed1170427c0a 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -105,7 +105,10 @@ in stdenv.mkDerivation {
     # needed for some packages, especially packages that backport functionality
     # to 2.x from 3.x
     for item in $out/lib/python${majorVersion}/test/*; do
-      if [[ "$item" != */test_support.py* ]]; then
+      if [[ "$item" != */test_support.py*
+         && "$item" != */test/support
+         && "$item" != */test/libregrtest
+         && "$item" != */test/regrtest.py* ]]; then
         rm -rf "$item"
       else
         echo $item
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 0b0f9c8be6ab..127c093501c3 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -105,7 +105,10 @@ in stdenv.mkDerivation {
     # needed for some packages, especially packages that backport functionality
     # to 2.x from 3.x
     for item in $out/lib/python${majorVersion}/test/*; do
-      if [[ "$item" != */test_support.py* ]]; then
+      if [[ "$item" != */test_support.py*
+         && "$item" != */test/support
+         && "$item" != */test/libregrtest
+         && "$item" != */test/regrtest.py* ]]; then
         rm -rf "$item"
       else
         echo $item

From b73e3b6095e5d8d952682d4b868e9ac7f633f0c2 Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Sun, 25 Jun 2017 17:59:23 +0100
Subject: [PATCH 66/75] GNOME: 3.22 -> 3.24

This is a squash commit of the joint work from:

* Jan Tojnar (@jtojnar)
* Linus Heckemann (@lheckemann)
* Ryan Mulligan (@ryantm)
* romildo (@romildo)
* Tom Hunger (@teh)
---
 nixos/doc/manual/release-notes/rl-1709.xml    |  7 ++-
 .../services/x11/display-managers/gdm.nix     | 19 +++++++-
 .../gnome-3/3.22/apps/bijiben/src.nix         | 10 ----
 .../desktops/gnome-3/3.22/apps/cheese/src.nix | 10 ----
 .../gnome-3/3.22/apps/evolution/src.nix       | 10 ----
 .../gnome-3/3.22/apps/file-roller/src.nix     | 10 ----
 .../gnome-3/3.22/apps/gnome-boxes/src.nix     | 10 ----
 .../gnome-3/3.22/apps/gnome-calendar/src.nix  | 10 ----
 .../3.22/apps/gnome-characters/src.nix        | 10 ----
 .../gnome-3/3.22/apps/gnome-clocks/src.nix    | 10 ----
 .../gnome-3/3.22/apps/gnome-documents/src.nix | 10 ----
 .../apps/gnome-getting-started-docs/src.nix   | 10 ----
 .../gnome-3/3.22/apps/gnome-logs/src.nix      | 10 ----
 .../gnome-3/3.22/apps/gnome-maps/soup.patch   | 12 -----
 .../gnome-3/3.22/apps/gnome-maps/src.nix      | 10 ----
 .../gnome-3/3.22/apps/gnome-music/src.nix     | 10 ----
 .../gnome-3/3.22/apps/gnome-photos/src.nix    | 10 ----
 .../gnome-3/3.22/apps/gnome-weather/src.nix   | 10 ----
 .../desktops/gnome-3/3.22/apps/polari/src.nix | 10 ----
 .../3.22/core/adwaita-icon-theme/src.nix      | 10 ----
 .../desktops/gnome-3/3.22/core/baobab/src.nix | 10 ----
 pkgs/desktops/gnome-3/3.22/core/eog/src.nix   | 10 ----
 .../gnome-3/3.22/core/epiphany/src.nix        | 10 ----
 .../desktops/gnome-3/3.22/core/evince/src.nix | 10 ----
 .../3.22/core/evolution-data-server/src.nix   | 10 ----
 .../core/gdm/disable_x_access_control.patch   | 13 -----
 .../gnome-3/3.22/core/gdm/libsystemd.patch    | 21 ---------
 .../3.22/core/gdm/no-dbus-launch.patch        | 20 --------
 .../gnome-3/3.22/core/gdm/sessions_dir.patch  | 21 ---------
 pkgs/desktops/gnome-3/3.22/core/gdm/src.nix   | 10 ----
 .../gnome-3/3.22/core/gdm/xserver_path.patch  | 17 -------
 .../gnome-3/3.22/core/geocode-glib/src.nix    | 10 ----
 pkgs/desktops/gnome-3/3.22/core/gjs/src.nix   | 11 -----
 .../3.22/core/gnome-backgrounds/src.nix       | 10 ----
 .../3.22/core/gnome-calculator/src.nix        | 10 ----
 .../3.22/core/gnome-control-center/src.nix    | 10 ----
 .../gnome-3/3.22/core/gnome-desktop/src.nix   | 10 ----
 .../3.22/core/gnome-dictionary/src.nix        | 10 ----
 .../3.22/core/gnome-disk-utility/src.nix      | 10 ----
 .../3.22/core/gnome-font-viewer/src.nix       | 10 ----
 .../3.22/core/gnome-online-accounts/src.nix   | 10 ----
 .../3.22/core/gnome-online-miners/src.nix     | 10 ----
 .../gnome-3/3.22/core/gnome-session/src.nix   | 10 ----
 .../3.22/core/gnome-settings-daemon/src.nix   | 10 ----
 .../3.22/core/gnome-shell-extensions/src.nix  | 10 ----
 .../gnome-3/3.22/core/gnome-shell/src.nix     | 10 ----
 .../gnome-3/3.22/core/gnome-software/src.nix  | 10 ----
 .../3.22/core/gnome-system-monitor/src.nix    | 10 ----
 .../gnome-3/3.22/core/gnome-terminal/src.nix  | 10 ----
 .../gnome-3/3.22/core/gnome-user-docs/src.nix | 10 ----
 .../core/gsettings-desktop-schemas/src.nix    | 10 ----
 .../gnome-3/3.22/core/gtksourceview/src.nix   | 10 ----
 .../gnome-3/3.22/core/libgweather/src.nix     | 10 ----
 .../desktops/gnome-3/3.22/core/mutter/src.nix | 10 ----
 .../gnome-3/3.22/core/nautilus/src.nix        | 10 ----
 pkgs/desktops/gnome-3/3.22/core/sushi/src.nix | 10 ----
 pkgs/desktops/gnome-3/3.22/core/totem/src.nix | 10 ----
 .../gnome-3/3.22/core/tracker/src.nix         | 11 -----
 pkgs/desktops/gnome-3/3.22/core/vte/src.nix   | 11 -----
 .../desktops/gnome-3/3.22/core/zenity/src.nix | 10 ----
 .../gnome-3/3.22/devtools/devhelp/src.nix     | 10 ----
 .../gnome-3/3.22/games/gnome-chess/src.nix    | 10 ----
 .../gnome-3/3.22/games/gnome-mines/src.nix    | 10 ----
 .../gnome-3/3.22/games/gnome-nibbles/src.nix  | 10 ----
 .../gnome-3/3.22/games/gnome-sudoku/src.nix   | 10 ----
 .../gnome-3/3.22/games/lightsoff/src.nix      | 10 ----
 .../gnome-3/3.22/games/swell-foop/src.nix     | 10 ----
 pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix  | 10 ----
 .../gnome-3/3.22/misc/gnome-autoar/src.nix    | 12 -----
 .../3.22/misc/gnome-packagekit/src.nix        | 10 ----
 .../3.22/misc/gnome-tweak-tool/src.nix        | 10 ----
 .../apps/accerciser/default.nix               |  0
 .../{3.22 => 3.24}/apps/accerciser/src.nix    |  0
 .../{3.22 => 3.24}/apps/bijiben/default.nix   |  0
 .../gnome-3/3.24/apps/bijiben/src.nix         | 10 ++++
 .../{3.22 => 3.24}/apps/cheese/default.nix    |  0
 .../desktops/gnome-3/3.24/apps/cheese/src.nix | 10 ++++
 .../{3.22 => 3.24}/apps/evolution/default.nix | 11 ++++-
 .../gnome-3/3.24/apps/evolution/src.nix       | 10 ++++
 .../apps/file-roller/default.nix              |  0
 .../gnome-3/3.24/apps/file-roller/src.nix     | 10 ++++
 .../{3.22 => 3.24}/apps/gedit/default.nix     |  0
 .../gnome-3/{3.22 => 3.24}/apps/gedit/src.nix |  0
 .../{3.22 => 3.24}/apps/ghex/default.nix      |  0
 .../gnome-3/{3.22 => 3.24}/apps/ghex/src.nix  |  0
 .../{3.22 => 3.24}/apps/glade/default.nix     |  0
 .../gnome-3/{3.22 => 3.24}/apps/glade/src.nix |  0
 .../apps/gnome-boxes/default.nix              |  0
 .../gnome-3/3.24/apps/gnome-boxes/src.nix     | 10 ++++
 .../apps/gnome-calendar/default.nix           |  0
 .../gnome-3/3.24/apps/gnome-calendar/src.nix  | 10 ++++
 .../apps/gnome-characters/default.nix         |  2 +-
 .../3.24/apps/gnome-characters/src.nix        | 10 ++++
 .../apps/gnome-clocks/default.nix             |  0
 .../gnome-3/3.24/apps/gnome-clocks/src.nix    | 10 ++++
 .../apps/gnome-documents/default.nix          |  0
 .../gnome-3/3.24/apps/gnome-documents/src.nix | 10 ++++
 .../gnome-getting-started-docs/default.nix    |  0
 .../apps/gnome-getting-started-docs/src.nix   | 10 ++++
 .../apps/gnome-logs/default.nix               |  2 +-
 .../gnome-3/3.24/apps/gnome-logs/src.nix      | 10 ++++
 .../apps/gnome-maps/default.nix               | 14 ++++--
 .../gnome-3/3.24/apps/gnome-maps/src.nix      | 10 ++++
 .../apps/gnome-music/default.nix              |  0
 .../gnome-3/3.24/apps/gnome-music/src.nix     | 10 ++++
 .../apps/gnome-nettool/default.nix            |  0
 .../apps/gnome-photos/default.nix             |  4 +-
 .../gnome-3/3.24/apps/gnome-photos/src.nix    | 10 ++++
 .../apps/gnome-weather/default.nix            | 10 ++++
 .../gnome-3/3.24/apps/gnome-weather/src.nix   | 10 ++++
 .../apps/nautilus-sendto/default.nix          |  0
 .../{3.22 => 3.24}/apps/polari/default.nix    |  4 +-
 .../desktops/gnome-3/3.24/apps/polari/src.nix | 10 ++++
 .../{3.22 => 3.24}/apps/seahorse/default.nix  |  0
 .../{3.22 => 3.24}/apps/seahorse/src.nix      |  0
 .../{3.22 => 3.24}/apps/vinagre/default.nix   |  0
 .../{3.22 => 3.24}/apps/vinagre/src.nix       |  0
 .../core/adwaita-icon-theme/default.nix       |  0
 .../3.24/core/adwaita-icon-theme/src.nix      | 10 ++++
 .../{3.22 => 3.24}/core/baobab/default.nix    |  0
 .../desktops/gnome-3/3.24/core/baobab/src.nix | 10 ++++
 .../{3.22 => 3.24}/core/caribou/default.nix   |  1 +
 .../core/dconf-editor/default.nix             |  0
 .../{3.22 => 3.24}/core/dconf-editor/src.nix  |  0
 .../{3.22 => 3.24}/core/dconf/default.nix     |  0
 .../{3.22 => 3.24}/core/empathy/default.nix   |  0
 .../{3.22 => 3.24}/core/eog/default.nix       |  0
 pkgs/desktops/gnome-3/3.24/core/eog/src.nix   | 10 ++++
 .../{3.22 => 3.24}/core/epiphany/default.nix  |  4 +-
 .../gnome-3/3.24/core/epiphany/src.nix        | 10 ++++
 .../{3.22 => 3.24}/core/evince/default.nix    |  7 ---
 .../desktops/gnome-3/3.24/core/evince/src.nix | 10 ++++
 .../core/evolution-data-server/default.nix    | 15 ++++--
 .../3.24/core/evolution-data-server/src.nix   | 10 ++++
 .../{3.22 => 3.24}/core/folks/default.nix     |  0
 .../{3.22 => 3.24}/core/gconf/default.nix     |  0
 .../{3.22 => 3.24}/core/gcr/default.nix       |  0
 .../gnome-3/{3.22 => 3.24}/core/gcr/src.nix   |  0
 .../core/gdm/3.16-wip/default.nix             |  0
 .../3.16-wip/disable_x_access_control.patch   |  0
 .../core/gdm/3.16-wip/sessions_dir.patch      |  0
 .../core/gdm/3.16-wip/xserver_path.patch      |  0
 .../{3.22 => 3.24}/core/gdm/default.nix       | 10 ++--
 .../gdm/gdm-session-worker_xserver-path.patch |  0
 .../core/gdm/gdm-x-session_extra_args.patch   |  0
 .../core/gdm/gdm-x-session_path.patch         |  0
 .../gnome-3/3.24/core/gdm/sessions_dir.patch  | 23 +++++++++
 pkgs/desktops/gnome-3/3.24/core/gdm/src.nix   | 10 ++++
 .../core/geocode-glib/default.nix             |  0
 .../gnome-3/3.24/core/geocode-glib/src.nix    | 10 ++++
 .../{3.22 => 3.24}/core/gjs/default.nix       |  9 +++-
 pkgs/desktops/gnome-3/3.24/core/gjs/src.nix   | 10 ++++
 .../core/gnome-backgrounds/default.nix        |  0
 .../3.24/core/gnome-backgrounds/src.nix       | 10 ++++
 .../core/gnome-bluetooth/default.nix          |  0
 .../core/gnome-bluetooth/src.nix              |  6 +--
 .../core/gnome-calculator/default.nix         |  4 +-
 .../3.24/core/gnome-calculator/src.nix        | 10 ++++
 .../core/gnome-common/default.nix             |  0
 .../{3.22 => 3.24}/core/gnome-common/src.nix  |  0
 .../core/gnome-contacts/default.nix           |  0
 .../core/gnome-contacts/gio_unix.patch        |  0
 .../core/gnome-contacts/src.nix               |  0
 .../core/gnome-control-center/default.nix     |  0
 .../3.24/core/gnome-control-center/src.nix    | 10 ++++
 .../core/gnome-desktop/default.nix            |  0
 .../gnome-3/3.24/core/gnome-desktop/src.nix   | 10 ++++
 .../core/gnome-dictionary/default.nix         |  0
 .../3.24/core/gnome-dictionary/src.nix        | 10 ++++
 .../core/gnome-disk-utility/default.nix       |  0
 .../3.24/core/gnome-disk-utility/src.nix      | 10 ++++
 .../core/gnome-font-viewer/default.nix        |  0
 .../3.24/core/gnome-font-viewer/src.nix       | 10 ++++
 .../core/gnome-keyring/default.nix            |  0
 .../{3.22 => 3.24}/core/gnome-keyring/src.nix |  0
 .../core/gnome-menus/default.nix              |  0
 .../core/gnome-online-accounts/default.nix    |  0
 .../3.24/core/gnome-online-accounts/src.nix   | 10 ++++
 .../core/gnome-online-miners/default.nix      |  0
 .../3.24/core/gnome-online-miners/src.nix     | 10 ++++
 .../core/gnome-screenshot/default.nix         |  0
 .../core/gnome-screenshot/src.nix             |  0
 .../core/gnome-session/default.nix            |  6 ++-
 .../gnome-3/3.24/core/gnome-session/src.nix   | 10 ++++
 .../core/gnome-settings-daemon/default.nix    |  0
 .../3.24/core/gnome-settings-daemon/src.nix   | 10 ++++
 .../core/gnome-shell-extensions/default.nix   |  0
 .../3.24/core/gnome-shell-extensions/src.nix  | 10 ++++
 .../core/gnome-shell/default.nix              | 19 ++++++--
 .../gnome-3/3.24/core/gnome-shell/src.nix     | 10 ++++
 .../core/gnome-software/default.nix           |  4 +-
 .../gnome-3/3.24/core/gnome-software/src.nix  | 10 ++++
 .../core/gnome-system-log/default.nix         |  0
 .../core/gnome-system-monitor/default.nix     |  7 ++-
 .../3.24/core/gnome-system-monitor/src.nix    | 10 ++++
 .../core/gnome-terminal/default.nix           |  0
 .../gnome-3/3.24/core/gnome-terminal/src.nix  | 10 ++++
 .../core/gnome-themes-standard/default.nix    |  0
 .../core/gnome-themes-standard/src.nix        |  0
 .../core/gnome-user-docs/default.nix          |  0
 .../gnome-3/3.24/core/gnome-user-docs/src.nix | 10 ++++
 .../core/gnome-user-share/default.nix         |  0
 .../core/gnome-user-share/src.nix             |  0
 .../core/grilo-plugins/default.nix            |  0
 .../{3.22 => 3.24}/core/grilo/default.nix     |  4 +-
 .../{3.22 => 3.24}/core/grilo/setup-hook.sh   |  0
 .../gsettings-desktop-schemas/default.nix     |  0
 .../core/gsettings-desktop-schemas/src.nix    | 10 ++++
 .../{3.22 => 3.24}/core/gsound/default.nix    |  0
 .../core/gtksourceview/default.nix            |  0
 .../core/gtksourceview/nix_share_path.patch   |  0
 .../gnome-3/3.24/core/gtksourceview/src.nix   | 10 ++++
 .../core/gtksourceviewmm/default.nix          |  0
 .../core/gtksourceviewmm/src.nix              |  0
 .../{3.22 => 3.24}/core/gucharmap/default.nix |  0
 .../{3.22 => 3.24}/core/gucharmap/src.nix     |  0
 .../{3.22 => 3.24}/core/libcroco/default.nix  |  0
 .../{3.22 => 3.24}/core/libgdata/default.nix  |  0
 .../{3.22 => 3.24}/core/libgee/default.nix    |  0
 .../core/libgee/fix_introspection_paths.patch |  0
 .../{3.22 => 3.24}/core/libgepub/default.nix  |  0
 .../core/libgnome-keyring/default.nix         |  0
 .../core/libgnomekbd/default.nix              |  0
 .../{3.22 => 3.24}/core/libgnomekbd/src.nix   |  0
 .../core/libgweather/default.nix              |  2 -
 .../gnome-3/3.24/core/libgweather/src.nix     | 10 ++++
 .../{3.22 => 3.24}/core/libgxps/default.nix   |  0
 .../{3.22 => 3.24}/core/libpeas/default.nix   |  0
 .../{3.22 => 3.24}/core/libpeas/src.nix       |  0
 .../core/libzapojit/default.nix               |  0
 .../{3.22 => 3.24}/core/mutter/default.nix    | 10 +++-
 .../{3.22 => 3.24}/core/mutter/math.patch     |  0
 .../desktops/gnome-3/3.24/core/mutter/src.nix | 10 ++++
 .../{3.22 => 3.24}/core/mutter/x86.patch      |  0
 .../{3.22 => 3.24}/core/nautilus/default.nix  |  0
 .../core/nautilus/extension_dir.patch         |  0
 .../gnome-3/3.24/core/nautilus/src.nix        | 10 ++++
 .../{3.22 => 3.24}/core/rest/default.nix      |  0
 .../{3.22 => 3.24}/core/sushi/default.nix     |  0
 pkgs/desktops/gnome-3/3.24/core/sushi/src.nix | 10 ++++
 .../core/totem-pl-parser/default.nix          |  0
 .../{3.22 => 3.24}/core/totem/default.nix     |  1 -
 pkgs/desktops/gnome-3/3.24/core/totem/src.nix | 10 ++++
 .../{3.22 => 3.24}/core/tracker/default.nix   |  7 ++-
 .../gnome-3/3.24/core/tracker/src.nix         | 10 ++++
 .../{3.22 => 3.24}/core/vino/default.nix      |  0
 .../gnome-3/{3.22 => 3.24}/core/vino/src.nix  |  0
 .../gnome-3/{3.22 => 3.24}/core/vte/2.90.nix  |  0
 .../{3.22 => 3.24}/core/vte/default.nix       |  2 +-
 .../core/vte/fix_g_test_init_calls.patch      |  0
 .../vte/fix_vteseq_n_lookup_declaration.patch |  0
 .../gnome-3/{3.22 => 3.24}/core/vte/ng.nix    |  0
 pkgs/desktops/gnome-3/3.24/core/vte/src.nix   | 10 ++++
 .../core/yelp-tools/default.nix               |  0
 .../{3.22 => 3.24}/core/yelp-tools/src.nix    |  0
 .../{3.22 => 3.24}/core/yelp-xsl/default.nix  |  0
 .../{3.22 => 3.24}/core/yelp-xsl/src.nix      |  0
 .../{3.22 => 3.24}/core/yelp/default.nix      |  0
 .../gnome-3/{3.22 => 3.24}/core/yelp/src.nix  |  0
 .../{3.22 => 3.24}/core/zenity/default.nix    |  0
 .../desktops/gnome-3/3.24/core/zenity/src.nix | 10 ++++
 .../gnome-3/{3.22 => 3.24}/default.nix        |  7 +--
 .../{3.22 => 3.24}/desktop/rarian/default.nix |  0
 .../devtools/anjuta/default.nix               |  0
 .../{3.22 => 3.24}/devtools/anjuta/src.nix    |  0
 .../devtools/devhelp/default.nix              |  0
 .../gnome-3/3.24/devtools/devhelp/src.nix     | 10 ++++
 .../{3.22 => 3.24}/devtools/gdl/default.nix   |  0
 .../{3.22 => 3.24}/devtools/gdl/src.nix       |  0
 .../devtools/gnome-devel-docs/default.nix     |  0
 .../devtools/gnome-devel-docs/src.nix         |  0
 .../devtools/nemiver/bool_slot.patch          |  0
 .../devtools/nemiver/default.nix              |  0
 .../devtools/nemiver/safe_ptr.patch           |  0
 .../{3.22 => 3.24}/devtools/nemiver/src.nix   |  0
 .../games/aisleriot/default.nix               |  0
 .../{3.22 => 3.24}/games/aisleriot/src.nix    |  0
 .../games/five-or-more/default.nix            |  0
 .../{3.22 => 3.24}/games/five-or-more/src.nix |  0
 .../games/four-in-a-row/default.nix           |  0
 .../games/four-in-a-row/src.nix               |  0
 .../games/gnome-chess/default.nix             |  0
 .../gnome-3/3.24/games/gnome-chess/src.nix    | 10 ++++
 .../games/gnome-klotski/default.nix           |  0
 .../games/gnome-klotski/src.nix               |  0
 .../games/gnome-mahjongg/default.nix          |  0
 .../games/gnome-mahjongg/src.nix              |  0
 .../games/gnome-mines/default.nix             |  0
 .../gnome-3/3.24/games/gnome-mines/src.nix    | 10 ++++
 .../games/gnome-nibbles/default.nix           |  0
 .../gnome-3/3.24/games/gnome-nibbles/src.nix  | 10 ++++
 .../games/gnome-robots/default.nix            |  0
 .../{3.22 => 3.24}/games/gnome-robots/src.nix |  0
 .../games/gnome-sudoku/default.nix            |  0
 .../gnome-3/3.24/games/gnome-sudoku/src.nix   | 10 ++++
 .../games/gnome-taquin/default.nix            |  0
 .../{3.22 => 3.24}/games/gnome-taquin/src.nix |  0
 .../games/gnome-tetravex/default.nix          |  0
 .../games/gnome-tetravex/src.nix              |  0
 .../{3.22 => 3.24}/games/hitori/default.nix   |  0
 .../{3.22 => 3.24}/games/hitori/src.nix       |  0
 .../{3.22 => 3.24}/games/iagno/default.nix    |  0
 .../{3.22 => 3.24}/games/iagno/src.nix        |  0
 .../games/lightsoff/default.nix               |  0
 .../gnome-3/3.24/games/lightsoff/src.nix      | 10 ++++
 .../games/quadrapassel/default.nix            |  0
 .../{3.22 => 3.24}/games/quadrapassel/src.nix |  0
 .../games/swell-foop/default.nix              |  0
 .../gnome-3/3.24/games/swell-foop/src.nix     | 10 ++++
 .../{3.22 => 3.24}/games/tali/default.nix     |  0
 .../gnome-3/{3.22 => 3.24}/games/tali/src.nix |  0
 .../gnome-3/{3.22 => 3.24}/installer.nix      |  0
 ...d-with-evolution-data-server-3.13.90.patch |  0
 .../misc/california/default.nix               |  0
 .../{3.22 => 3.24}/misc/geary/default.nix     |  0
 .../{3.22 => 3.24}/misc/gexiv2/default.nix    |  0
 .../{3.22 => 3.24}/misc/gfbgraph/default.nix  |  0
 .../{3.22 => 3.24}/misc/gitg/default.nix      |  0
 pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix  | 10 ++++
 .../misc/gnome-autoar/default.nix             |  0
 .../gnome-3/3.24/misc/gnome-autoar/src.nix    | 10 ++++
 .../misc/gnome-packagekit/default.nix         |  0
 .../3.24/misc/gnome-packagekit/src.nix        | 10 ++++
 ...themes-and-icons-in-system-data-dirs.patch | 47 ++++++++++---------
 ...-multiple-entries-for-a-single-theme.patch | 45 +++++++++---------
 ...reate-config-dir-if-it-doesn-t-exist.patch | 12 ++---
 .../misc/gnome-tweak-tool/default.nix         | 21 ++++-----
 .../gnome-tweak-tool/find_gsettings.patch     |  0
 .../3.24/misc/gnome-tweak-tool/src.nix        | 10 ++++
 .../misc/gnome-video-effects/default.nix      |  0
 .../{3.22 => 3.24}/misc/gpaste/default.nix    | 10 ++--
 .../{3.22 => 3.24}/misc/gspell/default.nix    |  4 +-
 .../{3.22 => 3.24}/misc/gspell/src.nix        |  4 +-
 .../{3.22 => 3.24}/misc/gtkhtml/default.nix   |  0
 .../{3.22 => 3.24}/misc/gtkhtml/src.nix       |  0
 .../misc/libgames-support/default.nix         |  0
 .../{3.22 => 3.24}/misc/libgda/default.nix    |  0
 .../{3.22 => 3.24}/misc/libgda/src.nix        |  0
 .../misc/libgit2-glib/default.nix             |  0
 .../{3.22 => 3.24}/misc/libgit2-glib/src.nix  |  0
 .../misc/libmediaart/default.nix              |  4 +-
 .../{3.22 => 3.24}/misc/pidgin/default.nix    |  0
 .../{3.22 => 3.24}/misc/pomodoro/default.nix  |  0
 .../extensions/chrome-gnome-shell/default.nix | 16 +++----
 .../extensions/dash-to-dock/default.nix       |  6 +--
 pkgs/desktops/mate/mate-themes/default.nix    |  3 +-
 .../libraries/appstream-glib/default.nix      |  8 ++--
 pkgs/development/libraries/babl/default.nix   |  4 +-
 .../libraries/clutter-gst/default.nix         |  4 +-
 .../development/libraries/clutter/default.nix |  8 ++--
 pkgs/development/libraries/gegl/3.0.nix       |  4 +-
 .../development/libraries/geoclue/default.nix |  5 +-
 pkgs/development/libraries/glib/default.nix   |  4 +-
 .../gobject-introspection/default.nix         |  6 +--
 .../libraries/libchamplain/default.nix        |  4 +-
 .../python-modules/adal/default.nix           |  4 +-
 .../python-modules/pygobject/3.nix            |  6 +--
 pkgs/tools/misc/colord/default.nix            | 12 ++++-
 pkgs/top-level/all-packages.nix               |  4 +-
 359 files changed, 913 insertions(+), 922 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/eog/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/evince/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/totem/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/vte/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/accerciser/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/accerciser/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/bijiben/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/cheese/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/evolution/default.nix (89%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/file-roller/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gedit/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gedit/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/ghex/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/ghex/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/glade/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/glade/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-boxes/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-calendar/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-characters/default.nix (88%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-clocks/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-documents/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-getting-started-docs/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-logs/default.nix (88%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-maps/default.nix (62%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-music/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-nettool/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-photos/default.nix (90%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/gnome-weather/default.nix (58%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/nautilus-sendto/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/polari/default.nix (81%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/seahorse/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/seahorse/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/vinagre/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/apps/vinagre/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/adwaita-icon-theme/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/baobab/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/caribou/default.nix (99%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/dconf-editor/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/dconf-editor/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/dconf/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/empathy/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/eog/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/eog/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/epiphany/default.nix (93%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/evince/default.nix (90%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/evince/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/evolution-data-server/default.nix (62%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/folks/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gconf/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gcr/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gcr/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/3.16-wip/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/3.16-wip/disable_x_access_control.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/3.16-wip/sessions_dir.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/3.16-wip/xserver_path.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/default.nix (85%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/gdm-session-worker_xserver-path.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/gdm-x-session_extra_args.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gdm/gdm-x-session_path.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/geocode-glib/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gjs/default.nix (65%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-backgrounds/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-bluetooth/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-bluetooth/src.nix (53%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-calculator/default.nix (91%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-common/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-common/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-contacts/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-contacts/gio_unix.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-contacts/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-control-center/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-desktop/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-dictionary/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-disk-utility/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-font-viewer/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-keyring/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-keyring/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-menus/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-online-accounts/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-online-miners/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-screenshot/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-screenshot/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-session/default.nix (93%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-settings-daemon/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-shell-extensions/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-shell/default.nix (81%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-software/default.nix (90%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-system-log/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-system-monitor/default.nix (80%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-terminal/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-themes-standard/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-themes-standard/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-user-docs/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-user-share/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gnome-user-share/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/grilo-plugins/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/grilo/default.nix (92%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/grilo/setup-hook.sh (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gsettings-desktop-schemas/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gsound/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gtksourceview/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gtksourceview/nix_share_path.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gtksourceviewmm/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gtksourceviewmm/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gucharmap/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/gucharmap/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libcroco/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgdata/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgee/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgee/fix_introspection_paths.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgepub/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgnome-keyring/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgnomekbd/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgnomekbd/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgweather/default.nix (81%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libgxps/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libpeas/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libpeas/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/libzapojit/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/mutter/default.nix (89%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/mutter/math.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/mutter/x86.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/nautilus/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/nautilus/extension_dir.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/rest/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/sushi/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/totem-pl-parser/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/totem/default.nix (99%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/totem/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/tracker/default.nix (91%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vino/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vino/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vte/2.90.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vte/default.nix (95%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vte/fix_g_test_init_calls.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vte/fix_vteseq_n_lookup_declaration.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/vte/ng.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/vte/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp-tools/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp-tools/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp-xsl/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp-xsl/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/yelp/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/core/zenity/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/default.nix (98%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/desktop/rarian/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/anjuta/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/anjuta/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/devhelp/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/gdl/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/gdl/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/gnome-devel-docs/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/gnome-devel-docs/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/nemiver/bool_slot.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/nemiver/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/nemiver/safe_ptr.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/devtools/nemiver/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/aisleriot/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/aisleriot/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/five-or-more/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/five-or-more/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/four-in-a-row/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/four-in-a-row/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-chess/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-klotski/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-klotski/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-mahjongg/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-mahjongg/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-mines/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-nibbles/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-robots/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-robots/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-sudoku/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-taquin/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-taquin/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-tetravex/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/gnome-tetravex/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/hitori/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/hitori/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/iagno/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/iagno/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/lightsoff/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/quadrapassel/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/quadrapassel/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/swell-foop/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/tali/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/games/tali/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/installer.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/california/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/geary/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gexiv2/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gfbgraph/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gitg/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-autoar/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-packagekit/default.nix (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch (77%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch (72%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch (69%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-tweak-tool/default.nix (66%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-tweak-tool/find_gsettings.patch (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gnome-video-effects/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gpaste/default.nix (82%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gspell/default.nix (64%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gspell/src.nix (65%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gtkhtml/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/gtkhtml/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libgames-support/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libgda/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libgda/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libgit2-glib/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libgit2-glib/src.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/libmediaart/default.nix (82%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/pidgin/default.nix (100%)
 rename pkgs/desktops/gnome-3/{3.22 => 3.24}/misc/pomodoro/default.nix (100%)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index fc7fd49907ea..a8932a90803c 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -10,6 +10,11 @@
 has the following highlights: </para>
 
 <itemizedlist>
+  <listitem>
+    <para>
+      The Gnome version is now 3.24.
+    </para>
+  </listitem>
   <listitem>
     <para>
       The user handling now keeps track of deallocated UIDs/GIDs. When a user
@@ -207,7 +212,7 @@ rmdir /var/lib/ipfs/.ipfs
   <listitem>
     <para>
       Nixpkgs overlays may now be specified with a file as well as a directory. The
-      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and 
+      value of <literal>&lt;nixpkgs-overlays></literal> may be a file, and
       <filename>~/.config/nixpkgs/overlays.nix</filename> can be used instead of the
       <filename>~/.config/nixpkgs/overalys</filename> directory.
     </para>
diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 6c63fede857f..0e3b05cc5925 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -103,14 +103,29 @@ in
             (filter (arg: arg != "-terminate") cfg.xserverArgs);
           GDM_SESSIONS_DIR = "${cfg.session.desktops}";
           # Find the mouse
-          XCURSOR_PATH = "~/.icons:${config.system.path}/share/icons";
+          XCURSOR_PATH = "~/.icons:${gnome3.adwaita-icon-theme}/share/icons";
         };
         execCmd = "exec ${gdm}/bin/gdm";
       };
 
     # Because sd_login_monitor_new requires /run/systemd/machines
     systemd.services.display-manager.wants = [ "systemd-machined.service" ];
-    systemd.services.display-manager.after = [ "systemd-machined.service" ];
+    systemd.services.display-manager.after = [
+      "rc-local.service"
+      "systemd-machined.service"
+      "systemd-user-sessions.service"
+      "getty@tty1.service"
+    ];
+
+    systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
+    systemd.services.display-manager.serviceConfig = {
+        # Restart = "always"; - already defined in xserver.nix
+        KillMode = "mixed";
+        IgnoreSIGPIPE = "no";
+        BusName = "org.gnome.DisplayManager";
+        StandardOutput = "syslog";
+        StandardError = "inherit";
+    };
 
     systemd.services.display-manager.path = [ gnome3.gnome_session ];
 
diff --git a/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix
deleted file mode 100644
index b2c36c3d7aed..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/bijiben/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "bijiben-3.21.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/bijiben/3.21/bijiben-3.21.2.tar.xz;
-    sha256 = "d7f05abd82da837d8d48d9f7acc6035a289d934c722fc89870d17007ba158e0d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix
deleted file mode 100644
index 4a25b0153932..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/cheese/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "cheese-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/cheese/3.22/cheese-3.22.0.tar.xz;
-    sha256 = "0b52e4b0021cfb86a5abbd17356b72693f724892165d91b3ff7f5031a1ce53ea";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix
deleted file mode 100644
index a3e0121f6f1d..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evolution-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evolution/3.22/evolution-3.22.0.tar.xz;
-    sha256 = "3e4742032b450cd8752097ba7e56302134e3653d510d4c53196654fb353ebbeb";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix
deleted file mode 100644
index 029cdc2064d6..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/file-roller/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "file-roller-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/file-roller/3.22/file-roller-3.22.0.tar.xz;
-    sha256 = "5065b71d43deb3dc3c7af6efa3f3b1188a63bfafb213be86af1d262b1dc11d42";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
deleted file mode 100644
index ff43d41c53ab..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-boxes-3.22.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-boxes/3.22/gnome-boxes-3.22.4.tar.xz;
-    sha256 = "1wngw4c052p5ghdsd0mdrn20yi8xs0hjdq30rdwv9sqh40liqnjq";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix
deleted file mode 100644
index b1ff598acaf6..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-calendar-3.22.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-calendar/3.22/gnome-calendar-3.22.1.tar.xz;
-    sha256 = "e6a3670c63122c4b37fbe243a54486e019c1bfd9a27c709234fb81b9e0c13360";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix
deleted file mode 100644
index d4b90eb47682..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-characters-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-characters/3.22/gnome-characters-3.22.0.tar.xz;
-    sha256 = "0778b625646d6d934cf252d58a2e16403889da6bfc237bdca1d3cb3258f63d4e";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix
deleted file mode 100644
index 81a857cf1c03..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-clocks-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-clocks/3.22/gnome-clocks-3.22.0.tar.xz;
-    sha256 = "cdcd4ccd9716e7f12487a80d1b173aa28d9bde536d6274fbbc31acd6606c0511";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix
deleted file mode 100644
index ca9dca1ff4ca..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-documents-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-documents/3.22/gnome-documents-3.22.0.tar.xz;
-    sha256 = "edf5cd6b7b7f5847217b60885358030598e551010087d2a9d1765ae6777041ad";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix
deleted file mode 100644
index 4cb82624254a..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-getting-started-docs-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-getting-started-docs/3.22/gnome-getting-started-docs-3.22.0.tar.xz;
-    sha256 = "22b11fb4f6fd9f6d595dc01d5989fb1652c9a63732a4d1c997f3f5f82da75722";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix
deleted file mode 100644
index 995120855d53..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-logs-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-logs/3.22/gnome-logs-3.22.0.tar.xz;
-    sha256 = "114da79579d69840904970b2b3a72dc8f6be76a5673174b6628b42fd6781eb4f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch
deleted file mode 100644
index ef8c7a1287db..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/soup.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gnome-maps-3.18.0/configure.ac.orig	2015-09-24 18:38:31.912498368 +0200
-+++ gnome-maps-3.18.0/configure.ac	2015-09-24 18:38:40.783320413 +0200
-@@ -50,8 +50,9 @@
-     folks                        >= $FOLKS_MIN_VERSION
-     geocode-glib-1.0             >= $GEOCODE_MIN_VERSION
-     champlain-0.12               >= $CHAMPLAIN_MIN_VERSION
-     libxml-2.0
-     rest-0.7
-+    libsoup-2.4
- ])
- AC_SUBST(GNOME_MAPS_LIB_CFLAGS)
- AC_SUBST(GNOME_MAPS_LIB_LIBS)
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
deleted file mode 100644
index ef668faef533..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-maps-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-maps/3.22/gnome-maps-3.22.0.tar.xz;
-    sha256 = "7ce98a683f1c38d3ba1b5d68c7d05add9f9366774678fd50fdeeda6987163c39";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
deleted file mode 100644
index 5b3a79a111a3..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-music-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-music/3.22/gnome-music-3.22.0.tar.xz;
-    sha256 = "170685ffa89556951b9fb0b9225b2bca863e54348d4079a56b8e5c4eeafa9b03";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
deleted file mode 100644
index f28d626ff940..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-photos-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-photos/3.22/gnome-photos-3.22.0.tar.xz;
-    sha256 = "568329142855901a85f325ee014176e24f735b15a496842bcd31f5cb2615ba53";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
deleted file mode 100644
index 8cfab25381ee..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-weather-3.20.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-weather/3.20/gnome-weather-3.20.2.tar.xz;
-    sha256 = "7823ca7c08fa852232b98c2517830e3bd9b0ab80c9ac83f182c18ec140a5c18b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
deleted file mode 100644
index a8c4b303c383..000000000000
--- a/pkgs/desktops/gnome-3/3.22/apps/polari/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "polari-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/polari/3.22/polari-3.22.0.tar.xz;
-    sha256 = "90ea3db7ed0a03d46d9376e3201b4332f56d6149bc284379c367159094b73818";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
deleted file mode 100644
index a48b404ceb69..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "adwaita-icon-theme-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.tar.xz;
-    sha256 = "c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
deleted file mode 100644
index df4cefc48168..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/baobab/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "baobab-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/baobab/3.22/baobab-3.22.0.tar.xz;
-    sha256 = "796e784886d5bdf2e9d8ac94d74d5f94e055f4285ef54dc16552fb9c9b9c3e99";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/eog/src.nix b/pkgs/desktops/gnome-3/3.22/core/eog/src.nix
deleted file mode 100644
index f3995e6bc2c6..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/eog/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "eog-3.20.4";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/eog/3.20/eog-3.20.3.tar.xz;
-    sha256 = "09ic1ndvl31jnlsmigd5dgdv262ybq61ik0xh35kmvgcklw8qc0n";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
deleted file mode 100644
index 2ec9189964a5..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/epiphany/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "epiphany-3.22.6";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/epiphany/3.22/epiphany-3.22.5.tar.xz;
-    sha256 = "0ib7z8x65gcr6vc6709df1rngcfrp3xn5ywqlrnc2xrsynrhghz9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix b/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
deleted file mode 100644
index 07997a5c095a..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/evince/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evince-3.22.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evince/3.22/evince-3.22.1.tar.xz;
-    sha256 = "f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
deleted file mode 100644
index 84817846f726..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "evolution-data-server-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/evolution-data-server/3.22/evolution-data-server-3.22.0.tar.xz;
-    sha256 = "8653a9a28980e661e8b91ba335dae04a0553e12611ad155bc48fb3fb3c98653d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
deleted file mode 100644
index e100e013b786..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/disable_x_access_control.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gdm-3.14.2/daemon/gdm-slave.c.orig	2015-04-16 15:05:27.844353079 +0200
-+++ gdm-3.14.2/daemon/gdm-slave.c	2015-04-16 15:05:40.240417915 +0200
-@@ -369,8 +369,9 @@
-                 gdm_error_trap_push ();
- 
-                 for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
--                        XAddHost (slave->priv->server_display, &host_entries[i]);
-+                        //XAddHost (slave->priv->server_display, &host_entries[i]);
-                 }
-+                XDisableAccessControl(slave->priv->server_display);
- 
-                 XSync (slave->priv->server_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
deleted file mode 100644
index 4556f418cc81..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/libsystemd.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/GNOME/gdm/commit/eee5bf72c9bb1c1d62eb0e7102088ae3b9a188cd
---- a/configure.ac	2016-05-27 11:10:44.589740789 +0200
-+++ b/configure.ac	2016-05-27 11:11:00.146427723 +0200
-@@ -888,7 +888,7 @@
- dnl ---------------------------------------------------------------------------
- 
- PKG_CHECK_MODULES(SYSTEMD,
--                  [libsystemd-login >= 186 libsystemd-daemon],
-+                  [libsystemd],
-                   [have_systemd=yes], [have_systemd=no])
- 
- if test "x$with_systemd" = "xauto" ; then
-@@ -912,7 +912,7 @@
- AC_SUBST(SYSTEMD_LIBS)
- 
- PKG_CHECK_MODULES(JOURNALD,
--                  [libsystemd-journal],
-+                  [libsystemd],
-                   [have_journald=yes], [have_journald=no])
- 
- if test "x$enable_systemd_journal" = "xauto" ; then
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
deleted file mode 100644
index c87554078c7c..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/no-dbus-launch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/daemon/gdm-launch-environment.c	2015-06-22 15:11:07.277474398 +0000
-+++ b/daemon/gdm-launch-environment.c	2015-06-22 15:12:31.301157665 +0000
-@@ -48,8 +48,6 @@
- #include "gdm-session-enum-types.h"
- #include "gdm-launch-environment.h"
- 
--#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"
--
- extern char **environ;
- 
- #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))
-@@ -512,7 +510,7 @@
-                 gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);
-         } else {
-                 /* wrap it in dbus-launch */
--                char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);
-+                char *command = g_strdup (launch_environment->priv->command);
- 
-                 gdm_session_select_program (launch_environment->priv->session, command);
-                 g_free (command);
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
deleted file mode 100644
index 9714a68600af..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/sessions_dir.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/daemon/gdm-session.c.orig b/daemon/gdm-session.c
-index b839fea..053d4ac 100644
---- a/daemon/gdm-session.c.orig
-+++ b/daemon/gdm-session.c
-@@ -344,12 +344,16 @@ get_system_session_dirs (GdmSession *self)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                "/var/empty",
-                 "/etc/X11/sessions/",
-                 DMCONFDIR "/Sessions/",
-                 DATADIR "/gdm/BuiltInSessions/",
-                 DATADIR "/xsessions/",
-                 NULL
-         };
-+        if (getenv("GDM_SESSIONS_DIR") != NULL) {
-+                search_dirs[1] = getenv("GDM_SESSIONS_DIR");
-+        };
- 
- #ifdef ENABLE_WAYLAND_SUPPORT
-         if (self->priv->ignore_wayland) {
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
deleted file mode 100644
index 795be7f4cfe0..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gdm-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gdm/3.22/gdm-3.22.0.tar.xz;
-    sha256 = "b9180d07c6a4a3fb0e8df6bcb4f333008cb3071f0ef81e02f081ff8a144f62d4";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
deleted file mode 100644
index 3f2ec808cd65..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/xserver_path.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-server.c.orig b/daemon/gdm-server.c
-index 6357d34..5bef5c8 100644
---- a/daemon/gdm-server.c.orig
-+++ b/daemon/gdm-server.c
-@@ -264,7 +264,11 @@ gdm_server_init_command (GdmServer *server)
-         return;
- 
- fallback:
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- 
- }
-
diff --git a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
deleted file mode 100644
index 135e05e90e99..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "geocode-glib-3.20.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/geocode-glib/3.20/geocode-glib-3.20.1.tar.xz;
-    sha256 = "669fc832cabf8cc2f0fc4194a8fa464cdb9c03ebf9aca5353d7cf935ba8637a2";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
deleted file mode 100644
index 7af8d7c531b3..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  name = "gjs-${major}.4";
-  major = "1.47";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${major}/${name}.tar.xz";
-    sha256 = "05x9yk3h53wn9fpwbcxl8yz71znhwhzwy7412di77x88ghkxi2c1";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
deleted file mode 100644
index 2b20cae9cdaf..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-backgrounds-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-backgrounds/3.22/gnome-backgrounds-3.22.0.tar.xz;
-    sha256 = "6c83e01647375d5c409312d7215d038d705a3f214179227ed37d3158afdd001f";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
deleted file mode 100644
index 891ce5c58f6e..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-calculator-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-calculator/3.22/gnome-calculator-3.22.0.tar.xz;
-    sha256 = "fa0f192fc0cad43a8520d4015780ce008d9fc6201bd2dd6dc06365ba45458728";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
deleted file mode 100644
index bbe7f5a009d2..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-control-center-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-control-center/3.22/gnome-control-center-3.22.0.tar.xz;
-    sha256 = "d264ae919aeeb27987dcdd5af5577fad0590e1f184f506b563c89f356aab5052";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
deleted file mode 100644
index 8efa20f01dc4..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-desktop-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-desktop/3.22/gnome-desktop-3.22.0.tar.xz;
-    sha256 = "cff36ccd8d0a62177a4c1513ec70d13ead3b84fdc208ba54199cf7616f05644d";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
deleted file mode 100644
index 249cb314c2aa..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-dictionary-3.20.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-dictionary/3.20/gnome-dictionary-3.20.0.tar.xz;
-    sha256 = "efb36377d46eff9291d3b8fec37baab2355f9dc8bc7edb791b6a625574716121";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
deleted file mode 100644
index c0a0798cd27e..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-disk-utility-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-disk-utility/3.22/gnome-disk-utility-3.22.0.tar.xz;
-    sha256 = "757d4ff438e63ac337a8681c9ef184a36143b39494381b609cdf889128d7fb22";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
deleted file mode 100644
index ee87655bba7d..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-font-viewer-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-font-viewer/3.22/gnome-font-viewer-3.22.0.tar.xz;
-    sha256 = "bd27cbc523016711508d7913878f32e262893cfcc7e10795171dbf8e35af9be0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
deleted file mode 100644
index 3c1c426d2641..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-online-accounts-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-online-accounts/3.22/gnome-online-accounts-3.22.0.tar.xz;
-    sha256 = "aacce93a71bf5e687a45ae0d00f31ea0625ddd8143235d6d8c64c4ec21bbfa33";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
deleted file mode 100644
index 2bafae9967e2..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-online-miners-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-online-miners/3.22/gnome-online-miners-3.22.0.tar.xz;
-    sha256 = "bf51666866527b236d980fa3a0d036581a85987c59d604566ccb3ad685dd8bb8";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
deleted file mode 100644
index 29f1ad93abb0..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-session-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-session/3.22/gnome-session-3.22.0.tar.xz;
-    sha256 = "ec5c5e133c8ff1c044802eb887f4911183c45ca2d9de4ce29c6f10768ddc8e42";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
deleted file mode 100644
index 1457aab1d013..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-settings-daemon-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-settings-daemon/3.22/gnome-settings-daemon-3.22.0.tar.xz;
-    sha256 = "430e42c4f2cc4cb72b669a44c744343f1592ec00d26d2168745a878afe73f82b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
deleted file mode 100644
index e17d02a011f0..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-shell-extensions-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell-extensions/3.22/gnome-shell-extensions-3.22.0.tar.xz;
-    sha256 = "317b35f6f1299d5162e693d39b21031f5fe875083c4020217db3ec056e245fc5";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
deleted file mode 100644
index b835eea019cf..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-shell-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell/3.22/gnome-shell-3.22.0.tar.xz;
-    sha256 = "d8d22cc19e28641f2eac47e812065c209e4866b6e5f9d636647a0a8c96e5dca9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
deleted file mode 100644
index a05e6bd09e57..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-software/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-software-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-software/3.22/gnome-software-3.22.0.tar.xz;
-    sha256 = "22e30c84851b0768bd46dbb90de6d3308acdc2973d3ca4ee52a19cdb5a0182ba";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
deleted file mode 100644
index e8e9ba375010..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-system-monitor-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-system-monitor/3.22/gnome-system-monitor-3.22.0.tar.xz;
-    sha256 = "4339d36c2f7b702652ee03424a241f855992c583bb437d7083c61d8dcfe3fff8";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
deleted file mode 100644
index 5d8088d78d34..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-terminal-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-terminal/3.22/gnome-terminal-3.22.0.tar.xz;
-    sha256 = "97e6b1b4128ac133d8917b3940c71ddf9b89d189c5ac8402b1060126733993ed";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
deleted file mode 100644
index e7e67e0b4fb3..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-user-docs-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-user-docs/3.22/gnome-user-docs-3.22.0.tar.xz;
-    sha256 = "7467825a1c56ae2522fe9e36622a84b8887c731bb5f24cecfbf49acc66f6e3fc";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
deleted file mode 100644
index 50a54eab7eb5..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gsettings-desktop-schemas-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.tar.xz;
-    sha256 = "0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
deleted file mode 100644
index 6e010227fc3b..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gtksourceview-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gtksourceview/3.22/gtksourceview-3.22.0.tar.xz;
-    sha256 = "70657f48732427984dce6cc812bdd3f2b701c0a49e0a0a08889705b3dadcf8e5";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
deleted file mode 100644
index 946573519465..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/libgweather/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "libgweather-3.20.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libgweather/3.20/libgweather-3.20.3.tar.xz;
-    sha256 = "fb6bc5b64ef5db3dc40a9798f072b83ebcafe7ff5af472aaee70600619b56c0b";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
deleted file mode 100644
index 02e9b6e0d84c..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "mutter-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/mutter/3.22/mutter-3.22.0.tar.xz;
-    sha256 = "a5acdde788f5d137ec6dfe218a214c1f6cfb7e2e851fbcebe0b2d67b4c96e5f3";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
deleted file mode 100644
index e0c7f3034f97..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/nautilus/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "nautilus-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/nautilus/3.22/nautilus-3.22.0.tar.xz;
-    sha256 = "7671d9cf9df0321f5ad03abce03ab35ab6d643e1b3392a84f3c1d7c23ce29816";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
deleted file mode 100644
index e1fc1011b569..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/sushi/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "sushi-3.21.91";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/sushi/3.21/sushi-3.21.91.tar.xz;
-    sha256 = "db71c9ec3dd2dde6aed03b469253ce7d9f30c60ff50c2a8dc9f7776b70d15d55";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem/src.nix b/pkgs/desktops/gnome-3/3.22/core/totem/src.nix
deleted file mode 100644
index 11e20f665b7e..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/totem/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "totem-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/totem/3.22/totem-3.22.0.tar.xz;
-    sha256 = "026a5b5b1674bdb941bc28e1ee95ecc168627e0fc323b6ec8d73407d21964fea";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix b/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
deleted file mode 100644
index 6889f6ee09ea..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/tracker/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-fetchurl: rec {
-  major = "1.10";
-  minor = "0";
-  name = "tracker-${major}.${minor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tracker/${major}/${name}.tar.xz";
-    sha256 = "df95b4a1e7de442f66d1097b725dd3cdd739862f491453fc7d7b1f88181a12fb";
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/src.nix b/pkgs/desktops/gnome-3/3.22/core/vte/src.nix
deleted file mode 100644
index d80749a2566a..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/vte/src.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  name = "vte-${major}.0";
-  major = "0.46";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vte/${major}/${name}.tar.xz";
-    sha256 = "5f7122e7860eb2470d310fc63df91d3ee32bab233729c2dc181a0cbc9b3249d7";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
deleted file mode 100644
index 75476b43b958..000000000000
--- a/pkgs/desktops/gnome-3/3.22/core/zenity/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "zenity-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/zenity/3.22/zenity-3.22.0.tar.xz;
-    sha256 = "1ecdfa1071d383b373b8135954b3ec38d402d671dcd528e69d144aff36a0e466";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
deleted file mode 100644
index 02747b9153cb..000000000000
--- a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "devhelp-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/devhelp/3.22/devhelp-3.22.0.tar.xz;
-    sha256 = "59cae02e12d238cc5fc3f049d779895ba89701426d9173f5b534d4ab90c5ffb0";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
deleted file mode 100644
index 1cced81517d7..000000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-chess-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-chess/3.22/gnome-chess-3.22.0.tar.xz;
-    sha256 = "838040c120af08aaa8ef1a6a284e2de296b998b37e49adb9436a12b6a428154a";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
deleted file mode 100644
index 67db003d99a0..000000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-mines-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-mines/3.22/gnome-mines-3.22.0.tar.xz;
-    sha256 = "ee6df05b36fdff0376371887c1375e63d9e90655146a9a787db3c3aa2b74908a";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
deleted file mode 100644
index e2948db9e4c1..000000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-nibbles-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-nibbles/3.22/gnome-nibbles-3.22.0.tar.xz;
-    sha256 = "9cbc0aa458af0a4c00fd1bd528c4c3fecaea713390e2cbee796b0a6930e0cb49";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
deleted file mode 100644
index 085cf2ffb203..000000000000
--- a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-sudoku-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-sudoku/3.22/gnome-sudoku-3.22.0.tar.xz;
-    sha256 = "0f39a7afb864c6cffa1991cc5fda958e0eb03329eebe21ca2d965588cf5fa0d5";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
deleted file mode 100644
index c79aa1582a1a..000000000000
--- a/pkgs/desktops/gnome-3/3.22/games/lightsoff/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "lightsoff-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/lightsoff/3.22/lightsoff-3.22.0.tar.xz;
-    sha256 = "0458e0ff99a10a99573db4d3e1ea5abde186056d8e32cf1f0bd76e25ff2c4fca";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
deleted file mode 100644
index e0644e539fb7..000000000000
--- a/pkgs/desktops/gnome-3/3.22/games/swell-foop/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "swell-foop-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/swell-foop/3.22/swell-foop-3.22.0.tar.xz;
-    sha256 = "e7bb6f4c7932a17c3f48e5b7df66f4e3953642e8126389531592a79fdf71e0a4";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
deleted file mode 100644
index 5a78b8d0ca6b..000000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gitg/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gitg-3.23.90";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gitg/3.23/gitg-3.23.90.tar.xz;
-    sha256 = "0m3g8ag8nh6vj5m188l7sgkm7p8mrs094mjijqaaav3r6cz91fdg";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
deleted file mode 100644
index c9f10fa8cd7f..000000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/src.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: rec {
-  pname = "gnome-autoar";
-  version = "0.1";
-  name = "${pname}-${version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${pname}/${version}/${name}.tar.xz";
-    sha256 = "f65cb810b562dc038ced739fbf59739fd5df1a8e848636e21f363ded9f349ac9";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
deleted file mode 100644
index 8937b7dd1a79..000000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-packagekit-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-packagekit/3.22/gnome-packagekit-3.22.0.tar.xz;
-    sha256 = "0b28d4928f9767a512723b49656266aaa2a7909d880e5e4238c0e3436ac4908c";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
deleted file mode 100644
index 88f3b3069f19..000000000000
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-tweak-tool-3.22.0";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-tweak-tool/3.22/gnome-tweak-tool-3.22.0.tar.xz;
-    sha256 = "3d6ae11e13f6169ee543e573135e1e5697cf92ab8d86570c6f952021ae093abb";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/accerciser/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/accerciser/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix b/pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/accerciser/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/accerciser/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/bijiben/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/bijiben/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix b/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
new file mode 100644
index 000000000000..ea2c063647f7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/bijiben/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "bijiben-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/bijiben/3.24/bijiben-3.24.1.tar.xz;
+    sha256 = "2602fc3f8ce5c39813b4273ceed7bdb014b1cf1fa82a6757fc25e5078be4f741";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/cheese/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/cheese/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix b/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
new file mode 100644
index 000000000000..e10f79e8312d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/cheese/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "cheese-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/cheese/3.24/cheese-3.24.0.tar.xz;
+    sha256 = "26d0324c11d858a53a8a78f60babda63310a2b6f46c8fa3a4f6aa36ca9d0f372";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
similarity index 89%
rename from pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
index 8da7fab90371..3d152221a397 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/evolution/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/evolution/default.nix
@@ -2,7 +2,8 @@
 , pkgconfig, gtk3, glib, libnotify, gtkspell3
 , wrapGAppsHook, itstool, shared_mime_info, libical, db, gcr, sqlite
 , gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap}:
+, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit, openldap
+, cmake}:
 
 let
   majVer = gnome3.version;
@@ -24,7 +25,9 @@ in stdenv.mkDerivation rec {
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
                   nss nspr libnotify procps highlight gnome3.libgweather
                   gnome3.gsettings_desktop_schemas
-                  gnome3.libgnome_keyring gnome3.glib_networking openldap ];
+                  gnome3.libgnome_keyring gnome3.glib_networking openldap
+                  cmake
+                ];
 
   nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
 
@@ -32,6 +35,10 @@ in stdenv.mkDerivation rec {
   configureFlags = [ "--disable-pst-import" "--disable-autoar"
                      "--disable-libcryptui" "--with-openldap"];
 
+  cmakeFlags = [ "-DENABLE_AUTOAR=OFF" "-DENABLE_LIBCRYPTUI=OFF"
+                 "-DENABLE_YTNEF=OFF" "-DENABLE_PST_IMPORT=OFF"
+               ];
+
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
new file mode 100644
index 000000000000..2aab7967d8a8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/evolution/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "evolution-3.24.5";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/evolution/3.24/evolution-3.24.5.tar.xz;
+    sha256 = "5544c5ea1a1c352e0300bff447ddf67146486fc3a6bbecd1b785d378d34b2189";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/file-roller/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/file-roller/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix b/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
new file mode 100644
index 000000000000..10a82877bcd8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/file-roller/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "file-roller-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/file-roller/3.24/file-roller-3.24.1.tar.xz;
+    sha256 = "011545e8bd81a415fb068718347bf63ced4ab176210ce36a668904a3124c7f3a";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gedit/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gedit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gedit/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gedit/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix b/pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/ghex/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/ghex/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix b/pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/ghex/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/ghex/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/glade/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/glade/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/glade/src.nix b/pkgs/desktops/gnome-3/3.24/apps/glade/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/glade/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/glade/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-boxes/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
new file mode 100644
index 000000000000..dbed46178504
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-boxes/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-boxes-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-boxes/3.24/gnome-boxes-3.24.0.tar.xz;
+    sha256 = "7495ea7184b6ef650033daf6941328b785b22e522e8142b9d190575d215dec49";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-calendar/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
new file mode 100644
index 000000000000..5d0eeadcc0ae
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-calendar/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-calendar-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-calendar/3.24/gnome-calendar-3.24.3.tar.xz;
+    sha256 = "3ecb4074f44cb6c883f81f93ebde2fa3890107f8e06740495be9f942190ff3ec";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
similarity index 88%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
index 4571a5d50e8b..0c7adcb03192 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-characters/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
-    librsvg gnome3.defaultIconTheme
+    librsvg gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
new file mode 100644
index 000000000000..db14a10d65a7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-characters/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-characters-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-characters/3.24/gnome-characters-3.24.0.tar.xz;
+    sha256 = "9ef4ff28437a63a221c47189231909fb9e4cac838c5f3cf402906fb128b52596";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-clocks/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
new file mode 100644
index 000000000000..2497fe83c1ed
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-clocks/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-clocks-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-clocks/3.24/gnome-clocks-3.24.0.tar.xz;
+    sha256 = "9d5ae0e972ad92d0a0873af9e0f9b00b8378b3cd50b7830e6fb9a227c6107f36";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-documents/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-documents/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
new file mode 100644
index 000000000000..c1ca08a064bf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-documents/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-documents-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-documents/3.24/gnome-documents-3.24.3.tar.xz;
+    sha256 = "c2f920fe1696499ba2594c9ab3328e7f18fa8f60df0273aaad503bbe27eeb9a0";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-getting-started-docs/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
new file mode 100644
index 000000000000..027cbb59d880
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-getting-started-docs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-getting-started-docs-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-getting-started-docs/3.24/gnome-getting-started-docs-3.24.1.tar.xz;
+    sha256 = "9e62895362597cf563696852294a4838cea7243f0116767c254c870b7ba94a97";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
similarity index 88%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
index d4135fdb1bae..2fc27617d98e 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-logs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    systemd gnome3.defaultIconTheme
+    systemd gnome3.gsettings_desktop_schemas gnome3.defaultIconTheme
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
new file mode 100644
index 000000000000..53e303f38566
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-logs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-logs-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-logs/3.24/gnome-logs-3.24.2.tar.xz;
+    sha256 = "9aaf0d6ba6af195dc9805b5f6d290b454a0b710daf0c595fe6286f59a43083c4";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
similarity index 62%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
index 8625f21f3db7..5af407ef15cd 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-maps/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
-, gobjectIntrospection, gdk_pixbuf, librsvg, autoreconfHook
+, gobjectIntrospection, gdk_pixbuf, librsvg, libgweather, autoreconfHook
 , geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup
 , webkitgtk }:
 
@@ -11,12 +11,20 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
                   gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
                   gnome3.geocode_glib libchamplain file libsoup
-                  gdk_pixbuf librsvg autoreconfHook
+                  gdk_pixbuf librsvg libgweather autoreconfHook
                   gnome3.gsettings_desktop_schemas gnome3.evolution_data_server
                   gnome3.gnome_online_accounts gnome3.defaultIconTheme
                   webkitgtk ];
 
-  patches = [ ./soup.patch ];
+  # The .service file isn't wrapped with the correct environment
+  # so misses GIR files when started. By re-pointing from the gjs
+  # entry point to the wrapped binary we get back to a wrapped
+  # binary.
+  preConfigure = ''
+    substituteInPlace "data/org.gnome.Maps.service.in" \
+        --replace "Exec=@pkgdatadir@/org.gnome.Maps" \
+                  "Exec=$out/bin/gnome-maps"
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Maps;
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
new file mode 100644
index 000000000000..e45d7be3fb77
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-maps/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-maps-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-maps/3.24/gnome-maps-3.24.3.tar.xz;
+    sha256 = "5ef3ec36aa76eb9a49a15ee61539bea7b59e8aa0a802483df6cedcc65566d0d6";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-music/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-music/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
new file mode 100644
index 000000000000..615c54583f29
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-music/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-music-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-music/3.24/gnome-music-3.24.2.tar.xz;
+    sha256 = "1a72b7972cac66c7aba7a4fbcbf8df99b3df7c46f26957b3e16089550d3ef62c";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-nettool/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-nettool/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
similarity index 90%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
index df7e23ef9d4f..6e8394950a6a 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-photos/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gtk3, glib
 , makeWrapper, itstool, gegl, babl, lcms2
 , desktop_file_utils, gmp, libmediaart, wrapGAppsHook
-, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2 }:
+, gnome3, librsvg, gdk_pixbuf, libexif, gexiv2, geocode_glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
                   gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
                   gnome3.gnome_online_accounts gnome3.gnome_desktop
                   lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
-                  wrapGAppsHook gexiv2 ];
+                  wrapGAppsHook gexiv2 geocode_glib ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
new file mode 100644
index 000000000000..78f3b7d672a3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-photos-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.2.tar.xz;
+    sha256 = "31ddc078ad2f6bc4bbfa2f71eb23377782750b9cb2ad2b0e6ff2a1971548cdf9";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
similarity index 58%
rename from pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
index dbd5377d5bf5..3b5542544d50 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/gnome-weather/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/default.nix
@@ -9,6 +9,16 @@ stdenv.mkDerivation rec {
     libgweather gnome3.defaultIconTheme geoclue2 gnome3.gsettings_desktop_schemas
   ];
 
+  # The .service file isn't wrapped with the correct environment
+  # so misses GIR files when started. By re-pointing from the gjs
+  # entry point to the wrapped binary we get back to a wrapped
+  # binary.
+  preConfigure = ''
+    substituteInPlace "data/org.gnome.Weather.Application.service.in" \
+        --replace "Exec=@pkgdatadir@/@PACKAGE_NAME@.Application" \
+                  "Exec=$out/bin/gnome-weather"
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/Apps/Weather;
     description = "Access current weather conditions and forecasts";
diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
new file mode 100644
index 000000000000..eef77b23504c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-weather/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-weather-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-weather/3.24/gnome-weather-3.24.0.tar.xz;
+    sha256 = "e36847884670e59a71ac70ed982fc8f2fb70f1766c3a24f10a0cd38c9b66d574";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/nautilus-sendto/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/nautilus-sendto/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
similarity index 81%
rename from pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
index f14a1ef3c47d..fc97d1b6d6e6 100644
--- a/pkgs/desktops/gnome-3/3.22/apps/polari/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/polari/default.nix
@@ -1,7 +1,7 @@
 { stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
 , telepathy_glib, gjs, itstool, telepathy_idle, libxml2
 , pkgconfig, gtk3, glib, librsvg, libsecret, libsoup
-, gnome3, wrapGAppsHook, telepathy_logger }:
+, gnome3, wrapGAppsHook, telepathy_logger, gspell }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   propagatedUserEnvPkgs = [ telepathy_idle telepathy_logger ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook gnome3.gsettings_desktop_schemas
-                  telepathy_glib telepathy_logger gjs gdk_pixbuf librsvg libxml2 libsecret libsoup ];
+                  telepathy_glib telepathy_logger gjs gspell gdk_pixbuf librsvg libxml2 libsecret libsoup ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix b/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
new file mode 100644
index 000000000000..da7a37031f57
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/apps/polari/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "polari-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/polari/3.24/polari-3.24.2.tar.xz;
+    sha256 = "3e1884000fda5cf6293e21ca1c028ec0b13d5baab5a79b8c11e4728c3238bb42";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/seahorse/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/seahorse/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix b/pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/seahorse/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/seahorse/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/vinagre/default.nix
rename to pkgs/desktops/gnome-3/3.24/apps/vinagre/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix b/pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/apps/vinagre/src.nix
rename to pkgs/desktops/gnome-3/3.24/apps/vinagre/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/adwaita-icon-theme/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix b/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
new file mode 100644
index 000000000000..5700cb56913f
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/adwaita-icon-theme/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "adwaita-icon-theme-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/adwaita-icon-theme/3.24/adwaita-icon-theme-3.24.0.tar.xz;
+    sha256 = "ccf79ff3bd340254737ce4d28b87f0ccee4b3358cd3cd5cd11dc7b42f41b272a";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/baobab/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/baobab/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix b/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
new file mode 100644
index 000000000000..8a2e35d454e3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/baobab/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "baobab-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/baobab/3.24/baobab-3.24.0.tar.xz;
+    sha256 = "5980e96df9f3d1751a969869ec07bc184ae3ad667d5a3eb06cf1297091fdfc3f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
similarity index 99%
rename from pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
index 2d71f1da5925..e405d8edfbaf 100644
--- a/pkgs/desktops/gnome-3/3.22/core/caribou/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/caribou/default.nix
@@ -13,6 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];
+
   buildInputs = with gnome3;
     [ glib gtk clutter at_spi2_core dbus pythonPackages.python
       pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/dconf-editor/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/dconf-editor/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix b/pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/dconf-editor/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/dconf-editor/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/dconf/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/dconf/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/empathy/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/empathy/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/eog/default.nix b/pkgs/desktops/gnome-3/3.24/core/eog/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/eog/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/eog/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/eog/src.nix b/pkgs/desktops/gnome-3/3.24/core/eog/src.nix
new file mode 100644
index 000000000000..72b02d0bba5a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/eog/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "eog-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/eog/3.24/eog-3.24.1.tar.xz;
+    sha256 = "f51ee116e2c159fac1719e003a32e1cb6cbff51914fd1f6409f461a790ff27e7";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
similarity index 93%
rename from pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
index 015f8213b443..ec8cf1188156 100644
--- a/pkgs/desktops/gnome-3/3.22/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/epiphany/default.nix
@@ -2,7 +2,7 @@
 , bash, wrapGAppsHook, gnome3, libwnck3, libxml2, libxslt, libtool
 , webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
 , sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, gdk_pixbuf, librsvg, gnome_common, gst_all_1 }:
+, gdk_pixbuf, librsvg, gnome_common, gst_all_1, json_glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
                   gcr avahi gnome3.gsettings_desktop_schemas gnome3.dconf
                   gnome3.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];
+                  gst_all_1.gst-libav json_glib ];
 
   NIX_CFLAGS_COMPILE = "-I${nss.dev}/include/nss -I${glib.dev}/include/gio-unix-2.0";
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix b/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
new file mode 100644
index 000000000000..85596c07fadb
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/epiphany/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "epiphany-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/epiphany/3.24/epiphany-3.24.3.tar.xz;
+    sha256 = "fef51676310d9f37e18c9b2d778254232eb17cccd988c2d1ecf42c7b2963a154";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix b/pkgs/desktops/gnome-3/3.24/core/evince/default.nix
similarity index 90%
rename from pkgs/desktops/gnome-3/3.22/core/evince/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/evince/default.nix
index 559e9b8575a2..aca10516a388 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/evince/default.nix
@@ -10,13 +10,6 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  patches = [
-    (fetchpatch {
-      name = "CVE-2017-1000083"; # https://bugzilla.gnome.org/show_bug.cgi?id=784630
-      url = "https://git.gnome.org/browse/evince/patch/?id=fa072dbbfd96";
-      sha256 = "12xg00jvbsh54dr2dyq2ha5a05x2bpzd1lh2k3sppq3h7a02lsjy";
-    })
-  ];
   # missing help for now; fixing the autogen phase seemed too difficult
   postPatch = "sed '/@YELP_HELP_RULES@/d' -i help/Makefile.am";
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/evince/src.nix b/pkgs/desktops/gnome-3/3.24/core/evince/src.nix
new file mode 100644
index 000000000000..aa45a79536ac
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/evince/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "evince-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/evince/3.24/evince-3.24.1.tar.xz;
+    sha256 = "9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix
similarity index 62%
rename from pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix
index c2038ecdce60..9d51dc969d33 100644
--- a/pkgs/desktops/gnome-3/3.22/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/default.nix
@@ -1,20 +1,25 @@
 { fetchurl, stdenv, pkgconfig, gnome3, python, dconf
 , intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala_0_32 }:
+, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true,
+vala_0_32, cmake, kerberos, openldap, webkitgtk, libaccounts-glib }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = with gnome3;
-    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts (stdenv.lib.getLib dconf)
-      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
+    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
+      (stdenv.lib.getLib dconf) gcr p11_kit libgweather libgdata gperf makeWrapper
+      icu sqlite gsettings_desktop_schemas cmake kerberos openldap webkitgtk
+      libaccounts-glib ]
     ++ stdenv.lib.optional valaSupport vala_0_32;
 
   propagatedBuildInputs = [ libsecret nss nspr libical db ];
 
   # uoa irrelevant for now
-  configureFlags = [ "--disable-uoa" "--disable-google-auth" ]
-                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
+  cmakeFlags = [ "-DENABLE_UOA=OFF" "-DENABLE_GOA=OFF" ]
+                   ++ stdenv.lib.optionals valaSupport [
+                     "-DENABLE_VALA_BINDINGS=ON" "-DENABLE_INTROSPECTION=ON"
+                     "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
new file mode 100644
index 000000000000..655fffe0eb9d
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/evolution-data-server/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "evolution-data-server-3.24.5";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/evolution-data-server/3.24/evolution-data-server-3.24.5.tar.xz;
+    sha256 = "6d8ec04b79c02bb517cc3e23ac3b23c7503465dfa27b7415955201a2f62844e1";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/folks/default.nix b/pkgs/desktops/gnome-3/3.24/core/folks/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/folks/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/folks/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.24/core/gconf/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gconf/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gconf/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gcr/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gcr/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gcr/src.nix b/pkgs/desktops/gnome-3/3.24/core/gcr/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gcr/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gcr/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/disable_x_access_control.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/sessions_dir.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/3.16-wip/xserver_path.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
similarity index 85%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
index 0d8e46aeeced..59f0381f2e87 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gdm/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
 , intltool, accountsservice, libX11, gnome3, systemd, autoreconfHook
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth }:
+, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection, plymouth
+, librsvg }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -18,17 +19,14 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig glib itstool libxml2 intltool autoreconfHook
                   accountsservice gnome3.dconf systemd
                   gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool plymouth ];
+                  libcanberra_gtk3 pam libtool plymouth librsvg ];
 
   enableParallelBuilding = true;
 
   # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch
-              ./sessions_dir.patch
+  patches = [ ./sessions_dir.patch
               ./gdm-x-session_extra_args.patch
               ./gdm-session-worker_xserver-path.patch
-             # ./disable_x_access_control.patch ./no-dbus-launch.patch
-             # ./libsystemd.patch
              ];
 
   installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/gdm-session-worker_xserver-path.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/gdm-session-worker_xserver-path.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_extra_args.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_extra_args.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gdm/gdm-x-session_path.patch
rename to pkgs/desktops/gnome-3/3.24/core/gdm/gdm-x-session_path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
new file mode 100644
index 000000000000..bbc803d49c19
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/sessions_dir.patch
@@ -0,0 +1,23 @@
+diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
+index ff3a1acb..b8705d8f 100644
+--- a/daemon/gdm-session.c
++++ b/daemon/gdm-session.c
+@@ -344,6 +344,7 @@ get_system_session_dirs (GdmSession *self)
+         char **search_dirs;
+ 
+         static const char *x_search_dirs[] = {
++                "/var/empty",
+                 "/etc/X11/sessions/",
+                 DMCONFDIR "/Sessions/",
+                 DATADIR "/gdm/BuiltInSessions/",
+@@ -351,6 +352,10 @@ get_system_session_dirs (GdmSession *self)
+                 NULL
+         };
+ 
++        if (getenv("GDM_SESSIONS_DIR") != NULL) {
++                x_search_dirs[0] = getenv("GDM_SESSIONS_DIR");
++        };
++
+         static const char *wayland_search_dir = DATADIR "/wayland-sessions/";
+ 
+         search_array = g_array_new (TRUE, TRUE, sizeof (char *));
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
new file mode 100644
index 000000000000..0dd7680467f9
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gdm/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gdm-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gdm/3.24/gdm-3.24.2.tar.xz;
+    sha256 = "4378b9fad5536e03c56ad138d0e249fbcaa09977b867895426cb41c978fe5de8";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/geocode-glib/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/geocode-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
new file mode 100644
index 000000000000..394e3a68c35c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/geocode-glib/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "geocode-glib-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/geocode-glib/3.24/geocode-glib-3.24.0.tar.xz;
+    sha256 = "19c1fef4fd89eb4bfe6decca45ac45a2eca9bb7933be560ce6c172194840c35e";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
similarity index 65%
rename from pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
index 1141db03c407..10d9c46123dd 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gjs/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gjs/default.nix
@@ -1,12 +1,17 @@
 { fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_31, pango, readline, glib, libxml2, dbus }:
+, spidermonkey_38, pango, readline, glib, libxml2, dbus }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline dbus ];
 
-  propagatedBuildInputs = [ spidermonkey_31 ];
+  propagatedBuildInputs = [ spidermonkey_38 ];
+
+  # GJS expects mozjs-38.pc but spidermonkey_38 only provides js.pc
+  preConfigure = ''
+    sed -i s/mozjs-38/js/ configure
+  '';
 
   postInstall = ''
     sed 's|-lreadline|-L${readline.out}/lib -lreadline|g' -i $out/lib/libgjs.la
diff --git a/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix b/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
new file mode 100644
index 000000000000..27162fcbfd45
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gjs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gjs-1.48.6";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gjs/1.48/gjs-1.48.6.tar.xz;
+    sha256 = "e85f65ba4b38bf80b6174949dfe6fce89e88b8213bbdde4ac1fde473c08bd312";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-backgrounds/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
new file mode 100644
index 000000000000..dce56f2341e8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-backgrounds/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-backgrounds-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-backgrounds/3.24/gnome-backgrounds-3.24.0.tar.xz;
+    sha256 = "cbda4c2159292940fa4b972df77379be716590c7b62bb4b2b9fa8e99749c71ca";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
similarity index 53%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
index 474d4722b4ab..5129b87e542e 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-bluetooth/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-bluetooth/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-bluetooth-3.20.0";
+  name = "gnome-bluetooth-3.20.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.0.tar.xz;
-    sha256 = "93b3ca16b348a168d044b3f777049b7dba2a9292c4adb2751a771e3bc5e4eb53";
+    url = mirror://gnome/sources/gnome-bluetooth/3.20/gnome-bluetooth-3.20.1.tar.xz;
+    sha256 = "1zlqcz6jz4vzzr8gd1678i9s4015kiwcpr5szrwz4kmryfsm147a";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
similarity index 91%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
index 0a177fbab31c..12b8af206ea0 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-calculator/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, libxml2
 , bash, gtk3, glib, wrapGAppsHook
-, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup }:
+, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp, libsoup, libmpc }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash gtk3 glib intltool itstool
                   libxml2 gnome3.gtksourceview mpfr gmp
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas gnome3.dconf libsoup ];
+                  gnome3.gsettings_desktop_schemas gnome3.dconf libsoup libmpc ];
 
   meta = with stdenv.lib; {
     homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
new file mode 100644
index 000000000000..9279cdb13af7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-calculator/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-calculator-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-calculator/3.24/gnome-calculator-3.24.0.tar.xz;
+    sha256 = "44758ac719edd20067381073de3c643f842308f26da039412b1978a415202d10";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-common/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-common/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-common/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-common/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-contacts/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-contacts/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-contacts/gio_unix.patch
rename to pkgs/desktops/gnome-3/3.24/core/gnome-contacts/gio_unix.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-contacts/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-contacts/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-control-center/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-control-center/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
new file mode 100644
index 000000000000..85dfcd2ef31c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-control-center/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-control-center-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-control-center/3.24/gnome-control-center-3.24.3.tar.xz;
+    sha256 = "43a4d2a4c222ee4a53428a4a720f823e157e4d4c597ea1a84e438d242596cca2";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-desktop/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-desktop/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
new file mode 100644
index 000000000000..83c2979656c3
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-desktop/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-desktop-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-desktop/3.24/gnome-desktop-3.24.2.tar.xz;
+    sha256 = "8fa1de66a6a75963bffc79b01a60434c71237d44c51beca09c0f714a032d785e";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-dictionary/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
new file mode 100644
index 000000000000..3c0a188c7b26
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-dictionary/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-dictionary-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-dictionary/3.24/gnome-dictionary-3.24.0.tar.xz;
+    sha256 = "41e7064a0cfab18e881a95ce9f1712ee5c9f426904b16f3bc04c35ebd1bbd9f2";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-disk-utility/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
new file mode 100644
index 000000000000..602b9eb340e4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-disk-utility/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-disk-utility-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-disk-utility/3.24/gnome-disk-utility-3.24.1.tar.xz;
+    sha256 = "878f0489947c813b44eb89f5fdc2790d757cd8565f26f22b950d55b8585653a1";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-font-viewer/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
new file mode 100644
index 000000000000..f4e37d476ddf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-font-viewer/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-font-viewer-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-font-viewer/3.24/gnome-font-viewer-3.24.0.tar.xz;
+    sha256 = "f3658216a744603fd2100d60de7b31062e014f02333e8433dcaf6a3bb4b7dc76";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-keyring/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-keyring/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-keyring/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-menus/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-menus/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-online-accounts/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
new file mode 100644
index 000000000000..2c51429cd0cd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-accounts/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-online-accounts-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-online-accounts/3.24/gnome-online-accounts-3.24.2.tar.xz;
+    sha256 = "b70ad52d1541e1e5192dd060bb11552a3af5007ab477aa81d265d1cd1cf7afba";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-online-miners/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
new file mode 100644
index 000000000000..00558f252952
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-online-miners/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-online-miners-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-online-miners/3.24/gnome-online-miners-3.24.0.tar.xz;
+    sha256 = "8c0508f459b0364bed5f2f6a997aa81c1cbe75a94b23cc8fcfd83b0d3485d3ab";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-screenshot/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-screenshot/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
similarity index 93%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
index 8dec630354ce..2cd92ce39ca1 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-session/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-session/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg }:
+, libxslt, intltool, makeWrapper, systemd, xorg, epoxy }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -9,7 +9,9 @@ stdenv.mkDerivation rec {
   buildInputs = with gnome3;
     [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt
       gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
-      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
+      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd
+      epoxy
+    ];
 
   # FIXME: glib binaries shouldn't be in .dev!
   preFixup = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
new file mode 100644
index 000000000000..d323fea7631c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-session/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-session-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-session/3.24/gnome-session-3.24.1.tar.xz;
+    sha256 = "3b4449238e396b95f9616dfd6f99d8345afaf30c7e3cb6a3549f253d9f966eee";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-settings-daemon/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
new file mode 100644
index 000000000000..03c213f21622
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-settings-daemon/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-settings-daemon-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-settings-daemon/3.24/gnome-settings-daemon-3.24.3.tar.xz;
+    sha256 = "68c46038bc32b7cbe933cc24fa9f1eb96127d9900c07627767ab0a802f948593";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-shell-extensions/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
new file mode 100644
index 000000000000..cb9bf57ce4a4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell-extensions/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-shell-extensions-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-shell-extensions/3.24/gnome-shell-extensions-3.24.3.tar.xz;
+    sha256 = "3c7defc6512d7ed9f09eb82342d7b6c8f5fe8dcac3f0126ca7e0569feeb50a79";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
similarity index 81%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
index 2ce3f9e39271..a694da0844de 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/default.nix
@@ -1,14 +1,15 @@
 { fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
 , python3Packages, libsoup, polkit, clutter, networkmanager, docbook_xsl , docbook_xsl_ns, at_spi2_core
 , libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, sqlite, libgweather, libcanberra_gtk3
+, sqlite, libgweather, libcanberra_gtk3, librsvg, geoclue2
 , libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
+, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet }:
 
 # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
 
 let
   pythonEnv = python3Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
+
 in stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
@@ -17,24 +18,29 @@ in stdenv.mkDerivation rec {
 
   buildInputs = with gnome3;
     [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf librsvg
+      libcroco intltool libsecret pkgconfig libsoup polkit libcanberra_gtk2 gdk_pixbuf
+      (librsvg.override { enableIntrospection = true; })
       clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
       libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
       libical libtool nss gtk gstreamer makeWrapper gdm
-      libcanberra_gtk3 gnome_control_center
+      libcanberra_gtk3 gnome_control_center geoclue2
       defaultIconTheme sqlite gnome3.gnome-bluetooth
       libgweather # not declared at build time, but typelib is needed at runtime
       gnome3.gnome-clocks # schemas needed
       at_spi2_core upower ibus gnome_desktop telepathy_logger gnome3.gnome_settings_daemon
-      pythonEnv gobjectIntrospection (stdenv.lib.getLib dconf) ];
+      gobjectIntrospection (stdenv.lib.getLib dconf) ];
 
   installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
 
   preBuild = ''
     patchShebangs src/data-to-c.pl
     substituteInPlace data/Makefile --replace " install-keysDATA" ""
+
+    substituteInPlace src/gnome-shell-extension-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
+    substituteInPlace src/gnome-shell-perf-tool.in --replace "@PYTHON@" "${pythonEnv}/bin/python"
   '';
 
+
   preFixup = with gnome3; ''
     wrapProgram "$out/bin/gnome-shell" \
       --prefix PATH : "${unzip}/bin" \
@@ -44,6 +50,9 @@ in stdenv.mkDerivation rec {
       --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
       --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
 
+    wrapProgram "$out/bin/gnome-shell-extension-prefs" \
+      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
new file mode 100644
index 000000000000..7cb2bd89221b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-shell/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-shell-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-shell/3.24/gnome-shell-3.24.3.tar.xz;
+    sha256 = "58b13308aa1b8dcbf1f08d5a052a61f8094ffd3afa2c788c91e1ceeacde840b8";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
similarity index 90%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
index a6a196625b45..2f4a1427ec0a 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-software/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-software/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, intltool, gnome3, wrapGAppsHook, packagekit
 , appstream-glib, libsoup, polkit, attr, acl, libyaml, isocodes, gtkspell3
-, json_glib, libsecret }:
+, json_glib, libsecret, valgrind-light }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gnome3.gtk packagekit appstream-glib libsoup
                   gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
                   gtkspell3 json_glib libsecret
-                  polkit attr acl libyaml ];
+                  polkit attr acl libyaml valgrind-light ];
   propagatedBuildInputs = [ isocodes ];
 
   postInstall = ''
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
new file mode 100644
index 000000000000..9d847b3af7d8
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-software/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-software-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-software/3.24/gnome-software-3.24.3.tar.xz;
+    sha256 = "0dbc8cbf0e46c5ef8c6a34391622d1532cf05c49976b39a8b8ee1fff8d8f75e3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-system-log/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-system-log/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
similarity index 80%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
index 8c3bf86edcfe..3164e4dd74b1 100644
--- a/pkgs/desktops/gnome-3/3.22/core/gnome-system-monitor/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
 , bash, gtk3, glib, wrapGAppsHook
-, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
+, itstool, gnome3, librsvg, gdk_pixbuf, libgtop, systemd }:
 
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
                   gtkmm3 libgtop wrapGAppsHook
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas ];
+                  gnome3.gsettings_desktop_schemas systemd ];
 
   preFixup = ''
     gappsWrapperArgs+=(
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
     )
   '';
 
+  # fails to build without --enable-static
+  configureFlags = ["--enable-systemd" "--enable-static"];
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
new file mode 100644
index 000000000000..aab373b9715b
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-system-monitor/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-system-monitor-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-system-monitor/3.24/gnome-system-monitor-3.24.0.tar.xz;
+    sha256 = "c32b45062411aaef06681e5e28fd2c24ea8b362168bae83992944ec8e02063f4";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-terminal/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-terminal/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
new file mode 100644
index 000000000000..2aa084cc4935
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-terminal/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-terminal-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-terminal/3.24/gnome-terminal-3.24.2.tar.xz;
+    sha256 = "281edac30a07ca45beaaaf0a13fe2219cf8b87ece5e55dccbfc49ef769dfec0f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-themes-standard/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-themes-standard/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-user-docs/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
new file mode 100644
index 000000000000..f617d41ff309
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gnome-user-docs/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-user-docs-3.24.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-user-docs/3.24/gnome-user-docs-3.24.2.tar.xz;
+    sha256 = "c1c53059c892bf9f78c7a934ab3a05ece35e2dacd828272e74a77a4f5975e65f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-user-share/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-user-share/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix b/pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gnome-user-share/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gnome-user-share/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/grilo-plugins/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/grilo-plugins/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
similarity index 92%
rename from pkgs/desktops/gnome-3/3.22/core/grilo/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
index 0deac26c2597..b4a794812a5c 100644
--- a/pkgs/desktops/gnome-3/3.22/core/grilo/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/grilo/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   major = "0.3"; # if you change this, also change ./setup-hook.sh
-  minor = "2";
+  minor = "3";
   name = "grilo-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/grilo/${major}/${name}.tar.xz";
-    sha256 = "f26f684a5d76aea8dbce136750bc67d2170b36575f109292fbb78ae99ec87f5b";
+    sha256 = "1qx072m0gl6m3d5g5cbbf13p4h217icmlxjnrn829x5xqwi451sw";
   };
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/grilo/setup-hook.sh
rename to pkgs/desktops/gnome-3/3.24/core/grilo/setup-hook.sh
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gsettings-desktop-schemas/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix b/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
new file mode 100644
index 000000000000..22760d2be113
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gsettings-desktop-schemas/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gsettings-desktop-schemas-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.0.tar.xz;
+    sha256 = "f6573a3f661d22ff8a001cc2421d8647717f1c0e697e342d03c6102f29bbbb90";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gsound/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gsound/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gtksourceview/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gtksourceview/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gtksourceview/nix_share_path.patch
rename to pkgs/desktops/gnome-3/3.24/core/gtksourceview/nix_share_path.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
new file mode 100644
index 000000000000..8648c595bb96
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/gtksourceview/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gtksourceview-3.24.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.3.tar.xz;
+    sha256 = "3eed05486a6420c3e2fdda0bbb19a0d905ed09ebf442302a026ab7e574204cbd";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix b/pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gtksourceviewmm/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gtksourceviewmm/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gucharmap/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/gucharmap/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix b/pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/gucharmap/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/gucharmap/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libcroco/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgdata/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgdata/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgee/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgee/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgee/fix_introspection_paths.patch
rename to pkgs/desktops/gnome-3/3.24/core/libgee/fix_introspection_paths.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgepub/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgepub/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgnome-keyring/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgnome-keyring/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgnomekbd/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgnomekbd/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix b/pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgnomekbd/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgnomekbd/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
similarity index 81%
rename from pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
index 79ede15df8f0..9dbed05523c3 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libgweather/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/libgweather/default.nix
@@ -4,8 +4,6 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
   configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
   propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
   nativeBuildInputs = [ pkgconfig intltool ];
diff --git a/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix b/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
new file mode 100644
index 000000000000..6324a27b6127
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/libgweather/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "libgweather-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/libgweather/3.24/libgweather-3.24.1.tar.xz;
+    sha256 = "1227316037b63dac4153031a22abccb3d2ac679a7409e29cd303eec499eb653c";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libgxps/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libgxps/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libpeas/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libpeas/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix b/pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libpeas/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/libpeas/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/libzapojit/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/libzapojit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
similarity index 89%
rename from pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
index 4818d05517ba..ebceb4ef706b 100644
--- a/pkgs/desktops/gnome-3/3.22/core/mutter/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/mutter/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
 , pango, cogl, clutter, libstartup_notification, libcanberra_gtk2, zenity, libcanberra_gtk3
-, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libudev, libinput
+, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon, libXtst, libudev, libinput
 , libgudev, xwayland }:
 
 stdenv.mkDerivation rec {
@@ -11,11 +11,17 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra --with-xwayland-path=${xwayland}/bin/Xwayland";
 
+  propagatedBuildInputs = [
+    # required for pkgconfig to detect mutter-clutter
+    libXtst
+  ];
+
   buildInputs = with gnome3;
     [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
       gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra_gtk2
       gnome3.geocode_glib libudev libinput libgudev
-      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
+      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile
+      libxkbcommon ];
 
   preFixup = ''
     wrapProgram "$out/bin/mutter" \
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/math.patch b/pkgs/desktops/gnome-3/3.24/core/mutter/math.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/mutter/math.patch
rename to pkgs/desktops/gnome-3/3.24/core/mutter/math.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix b/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
new file mode 100644
index 000000000000..579ee0689e87
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/mutter/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "mutter-3.24.4";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/mutter/3.24/mutter-3.24.4.tar.xz;
+    sha256 = "7300b3fbf1bd0f7fe25e4869dd37134f2127bb6d9b8aa3aadd0eaf3c8bbf9aea";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/mutter/x86.patch
rename to pkgs/desktops/gnome-3/3.24/core/mutter/x86.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/nautilus/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/nautilus/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/nautilus/extension_dir.patch
rename to pkgs/desktops/gnome-3/3.24/core/nautilus/extension_dir.patch
diff --git a/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
new file mode 100644
index 000000000000..37c81a54a316
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/nautilus/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "nautilus-3.24.2.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/nautilus/3.24/nautilus-3.24.2.1.tar.xz;
+    sha256 = "357d9d051fcc2c385ce9b3beb2db2ea1874b7cdf507ca10274a063023e1a61b3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/rest/default.nix b/pkgs/desktops/gnome-3/3.24/core/rest/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/rest/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/rest/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/sushi/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/sushi/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix b/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
new file mode 100644
index 000000000000..a713aef6f7f0
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/sushi/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "sushi-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/sushi/3.24/sushi-3.24.0.tar.xz;
+    sha256 = "f90bb95172664486f8d529995007fd12f0df9d0c998e20658b6203f46ce70d48";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/totem-pl-parser/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/totem-pl-parser/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/totem/default.nix b/pkgs/desktops/gnome-3/3.24/core/totem/default.nix
similarity index 99%
rename from pkgs/desktops/gnome-3/3.22/core/totem/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/totem/default.nix
index 6e62a2d522f6..b3e9e5dd1fee 100644
--- a/pkgs/desktops/gnome-3/3.22/core/totem/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/totem/default.nix
@@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
 
   GI_TYPELIB_PATH = "$out/lib/girepository-1.0";
-
   wrapPrefixVariables = [ "PYTHONPATH" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/desktops/gnome-3/3.24/core/totem/src.nix b/pkgs/desktops/gnome-3/3.24/core/totem/src.nix
new file mode 100644
index 000000000000..2067945f99e4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/totem/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "totem-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/totem/3.24/totem-3.24.0.tar.xz;
+    sha256 = "9bd78f7b940e886b5c809acdfe00a610a834de5080dd40272b92835528a58d01";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
similarity index 91%
rename from pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
index b086e3860597..a60c38015c08 100644
--- a/pkgs/desktops/gnome-3/3.22/core/tracker/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/tracker/default.nix
@@ -5,7 +5,8 @@
 , evolution_data_server, gst_all_1, poppler
 , icu, taglib, libjpeg, libtiff, giflib, libcue
 , libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2 }:
+, libpng, libexif, libgsf, libuuid, bzip2
+, libsoup, json_glib, libseccomp }:
 
 stdenv.mkDerivation rec {
 
@@ -24,7 +25,9 @@ stdenv.mkDerivation rec {
                   upower libnotify evolution_data_server gnome3.libgee
                   gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
                   poppler icu taglib libjpeg libtiff giflib libvorbis
-                  exempi networkmanager libpng libexif libgsf libuuid ];
+                  exempi networkmanager libpng libexif libgsf libuuid
+                  libsoup json_glib libseccomp
+                ];
 
   preConfigure = ''
     substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
diff --git a/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix b/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
new file mode 100644
index 000000000000..7a9b9ce3e38a
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/tracker/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "tracker-1.12.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/tracker/1.12/tracker-1.12.3.tar.xz;
+    sha256 = "1mpq418lzba7fad0w0m3bnxvz3khf461b5zya8zmq5n1g0w99ki3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/default.nix b/pkgs/desktops/gnome-3/3.24/core/vino/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vino/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/vino/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/vino/src.nix b/pkgs/desktops/gnome-3/3.24/core/vino/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vino/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/vino/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vte/2.90.nix
rename to pkgs/desktops/gnome-3/3.24/core/vte/2.90.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix b/pkgs/desktops/gnome-3/3.24/core/vte/default.nix
similarity index 95%
rename from pkgs/desktops/gnome-3/3.22/core/vte/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/vte/default.nix
index 09b83e14923f..7eabe6ad9d4d 100644
--- a/pkgs/desktops/gnome-3/3.22/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
-                  gnome3.gtk3 ncurses vala_0_32 libxml2 ];
+                  gnome3.gtk3 ncurses vala_0_32 libxml2 gperf ];
 
   propagatedBuildInputs = [ gnutls pcre2 ];
 
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch b/pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vte/fix_g_test_init_calls.patch
rename to pkgs/desktops/gnome-3/3.24/core/vte/fix_g_test_init_calls.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch b/pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vte/fix_vteseq_n_lookup_declaration.patch
rename to pkgs/desktops/gnome-3/3.24/core/vte/fix_vteseq_n_lookup_declaration.patch
diff --git a/pkgs/desktops/gnome-3/3.22/core/vte/ng.nix b/pkgs/desktops/gnome-3/3.24/core/vte/ng.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/vte/ng.nix
rename to pkgs/desktops/gnome-3/3.24/core/vte/ng.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/vte/src.nix b/pkgs/desktops/gnome-3/3.24/core/vte/src.nix
new file mode 100644
index 000000000000..841798848e60
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/vte/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "vte-0.48.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/vte/0.48/vte-0.48.3.tar.xz;
+    sha256 = "a3a9fb182740b392a45cd3f46fa61a985f68bb6b1817b52daec22034c46158c3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp-tools/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp-tools/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp-tools/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp-tools/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp-xsl/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp-xsl/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix b/pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp-xsl/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp-xsl/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/yelp/src.nix b/pkgs/desktops/gnome-3/3.24/core/yelp/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/yelp/src.nix
rename to pkgs/desktops/gnome-3/3.24/core/yelp/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.24/core/zenity/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/core/zenity/default.nix
rename to pkgs/desktops/gnome-3/3.24/core/zenity/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix b/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
new file mode 100644
index 000000000000..cb12262725a6
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/core/zenity/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "zenity-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/zenity/3.24/zenity-3.24.0.tar.xz;
+    sha256 = "6ff0a026ec94e5bc1b30f78df91e54f4f82fd982f4c29b52fe5dacc886a9f7f7";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/default.nix b/pkgs/desktops/gnome-3/3.24/default.nix
similarity index 98%
rename from pkgs/desktops/gnome-3/3.22/default.nix
rename to pkgs/desktops/gnome-3/3.24/default.nix
index 1944cc98cfb2..e3d53d3a24ec 100644
--- a/pkgs/desktops/gnome-3/3.22/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/default.nix
@@ -13,7 +13,7 @@ let
 
   callPackage = pkgs.newScope self;
 
-  version = "3.22";
+  version = "3.24";
   maintainers = with pkgs.lib.maintainers; [ lethalman ];
 
   corePackages = with gnome3; [
@@ -255,10 +255,7 @@ let
 
   accerciser = callPackage ./apps/accerciser { };
 
-  bijiben = callPackage ./apps/bijiben {
-    # https://bugzilla.gnome.org/show_bug.cgi?id=728293
-    webkitgtk = pkgs.webkitgtk24x-gtk3;
-  };
+  bijiben = callPackage ./apps/bijiben { };
 
   cheese = callPackage ./apps/cheese { };
 
diff --git a/pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/desktop/rarian/default.nix
rename to pkgs/desktops/gnome-3/3.24/desktop/rarian/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/anjuta/default.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/anjuta/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/anjuta/src.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/anjuta/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/devhelp/default.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/devhelp/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
new file mode 100644
index 000000000000..b13de444c7e7
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/devtools/devhelp/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "devhelp-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/devhelp/3.24/devhelp-3.24.0.tar.xz;
+    sha256 = "4858de1c815532ad160d1bf9facd28859972e3a052908a8edf73f866c8cce430";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/gdl/default.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/gdl/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/gdl/src.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/gdl/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/default.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/gnome-devel-docs/src.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/gnome-devel-docs/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/nemiver/bool_slot.patch
rename to pkgs/desktops/gnome-3/3.24/devtools/nemiver/bool_slot.patch
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/nemiver/default.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/nemiver/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/nemiver/safe_ptr.patch
rename to pkgs/desktops/gnome-3/3.24/devtools/nemiver/safe_ptr.patch
diff --git a/pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix b/pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/devtools/nemiver/src.nix
rename to pkgs/desktops/gnome-3/3.24/devtools/nemiver/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/aisleriot/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/aisleriot/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix b/pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/aisleriot/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/aisleriot/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/five-or-more/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/five-or-more/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix b/pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/five-or-more/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/five-or-more/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/four-in-a-row/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/four-in-a-row/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix b/pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/four-in-a-row/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/four-in-a-row/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-chess/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-chess/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
new file mode 100644
index 000000000000..3fb218ab6024
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-chess/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-chess-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-chess/3.24/gnome-chess-3.24.1.tar.xz;
+    sha256 = "6c9647beb7579b0a8de4e73698d931b1d9ac2efab4e7d3649f482d2c68ebf8a3";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-klotski/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-klotski/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-klotski/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-klotski/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-mahjongg/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-mahjongg/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-mines/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-mines/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
new file mode 100644
index 000000000000..4b0e85fdef10
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-mines/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-mines-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-mines/3.24/gnome-mines-3.24.0.tar.xz;
+    sha256 = "e663af29235a5c3f03d90f135487f57e5fd9137480dafb0ae9efc0da855602f6";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-nibbles/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
new file mode 100644
index 000000000000..133e9651fa74
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-nibbles/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-nibbles-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-nibbles/3.24/gnome-nibbles-3.24.0.tar.xz;
+    sha256 = "0ddc1fe03483958dd5513d04f5919ade991902d12da18a4c2d3307f818a5cb4f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-robots/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-robots/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-robots/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-robots/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-sudoku/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
new file mode 100644
index 000000000000..597196a5ec8c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/gnome-sudoku/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-sudoku-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-sudoku/3.24/gnome-sudoku-3.24.0.tar.xz;
+    sha256 = "04a29447889448ee5d5840cb5b2fd05ce6031c38a24809ce4919647ee6f485d7";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-taquin/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-taquin/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-taquin/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-taquin/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix b/pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/gnome-tetravex/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/gnome-tetravex/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/hitori/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/hitori/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/hitori/src.nix b/pkgs/desktops/gnome-3/3.24/games/hitori/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/hitori/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/hitori/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/iagno/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/iagno/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/iagno/src.nix b/pkgs/desktops/gnome-3/3.24/games/iagno/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/iagno/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/iagno/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/lightsoff/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/lightsoff/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix b/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
new file mode 100644
index 000000000000..2a26df6615bd
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/lightsoff/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "lightsoff-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/lightsoff/3.24/lightsoff-3.24.0.tar.xz;
+    sha256 = "5d1bb7de4b3f5c7814e5599a5171cfdeef74e774a8a6dbd992c893a5af6bd8ce";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/quadrapassel/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/quadrapassel/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix b/pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/quadrapassel/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/quadrapassel/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/swell-foop/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/swell-foop/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix b/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
new file mode 100644
index 000000000000..7fa5f724de26
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/games/swell-foop/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "swell-foop-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/swell-foop/3.24/swell-foop-3.24.0.tar.xz;
+    sha256 = "1b2d444e4d399e300afe07a243423c8b3ab1ca32828c749e0be9af48a5904a11";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/games/tali/default.nix b/pkgs/desktops/gnome-3/3.24/games/tali/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/tali/default.nix
rename to pkgs/desktops/gnome-3/3.24/games/tali/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/games/tali/src.nix b/pkgs/desktops/gnome-3/3.24/games/tali/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/games/tali/src.nix
rename to pkgs/desktops/gnome-3/3.24/games/tali/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/installer.nix b/pkgs/desktops/gnome-3/3.24/installer.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/installer.nix
rename to pkgs/desktops/gnome-3/3.24/installer.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
rename to pkgs/desktops/gnome-3/3.24/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
diff --git a/pkgs/desktops/gnome-3/3.22/misc/california/default.nix b/pkgs/desktops/gnome-3/3.24/misc/california/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/california/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/california/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/geary/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/geary/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gexiv2/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gexiv2/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gfbgraph/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gfbgraph/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gitg/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gitg/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
new file mode 100644
index 000000000000..9c6dd2148ccf
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gitg/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gitg-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gitg/3.24/gitg-3.24.0.tar.xz;
+    sha256 = "3e4ec4a8ae83bc7ced8c7610927ade70e37daa5e8beeb4f357a6ea30b4cc951e";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-autoar/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
new file mode 100644
index 000000000000..ee2ade83ee6c
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-autoar/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-autoar-0.2.2";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-autoar/0.2/gnome-autoar-0.2.2.tar.xz;
+    sha256 = "e1fe2c06eed30305c38bf0939c72b0e51b4716658e2663a0cf4a4bf57874ca62";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-packagekit/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/default.nix
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
new file mode 100644
index 000000000000..992badf1f4f4
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-packagekit/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-packagekit-3.24.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-packagekit/3.24/gnome-packagekit-3.24.0.tar.xz;
+    sha256 = "8d038681f6879c93f3f58faaa37c41c7ac8cf53eba6b8cb871f5f683ac0bd13f";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
similarity index 77%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
index 7a16d2c24e56..d236730282a9 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
@@ -1,6 +1,6 @@
-From bdbbe312e6520ce70e91319162e85367a69ce044 Mon Sep 17 00:00:00 2001
+From ac9e8e835888da1faa57f07c54fa4e73783621e2 Mon Sep 17 00:00:00 2001
 From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sat, 1 Aug 2015 21:01:11 +0200
+Date: Sun, 25 Jun 2017 11:32:30 +0100
 Subject: [PATCH 1/3] Search for themes and icons in system data dirs
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 1/3] Search for themes and icons in system data dirs
  gtweak/utils.py                        | 17 +++++++++++++++++
  3 files changed, 23 insertions(+), 18 deletions(-)
 
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
+index 97751ed..db89b85 100644
+--- a/gtweak/tweaks/tweak_group_interface.py
++++ b/gtweak/tweaks/tweak_group_interface.py
 @@ -26,7 +26,7 @@ from gi.repository import Gtk
  from gi.repository import GLib
  
@@ -22,7 +22,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
  from gtweak.gshellwrapper import GnomeShellFactory
  from gtweak.gsettings import GSettingsSetting
-@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
+@@ -50,10 +50,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
          if gtk_ver % 2: # Want even number
              gtk_ver += 1
  
@@ -34,7 +34,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
                      os.path.exists(os.path.join(d, "gtk-2.0")) and \
                          (os.path.exists(os.path.join(d, "gtk-3.0")) or \
                           os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
-@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTw
+@@ -69,10 +66,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
              **options)
  
      def _get_valid_icon_themes(self):
@@ -46,7 +46,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
                      os.path.isdir(d) and \
  			os.path.exists(os.path.join(d, "index.theme")))
          return valid
-@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsCombo
+@@ -87,10 +81,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
              **options)
  
      def _get_valid_cursor_themes(self):
@@ -58,20 +58,20 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
                      os.path.isdir(d) and \
                          os.path.exists(os.path.join(d, "cursors")))
          return valid
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
+diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
+index 69c4b7e..b06900c 100644
+--- a/gtweak/tweaks/tweak_group_keymouse.py
++++ b/gtweak/tweaks/tweak_group_keymouse.py
+@@ -21,7 +21,7 @@ from gi.repository import GLib
  
  import gtweak
+ from gtweak.gshellwrapper import GnomeShellFactory
 -from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
 +from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
  from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
  
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -48,10 +48,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
+ _shell = GnomeShellFactory().get_shell()
+@@ -41,10 +41,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
              **options)
  
      def _get_valid_key_themes(self):
@@ -83,10 +83,10 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
                      os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
                      os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
          return valid
-Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
-+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
+diff --git a/gtweak/utils.py b/gtweak/utils.py
+index 39f8833..b0993b6 100644
+--- a/gtweak/utils.py
++++ b/gtweak/utils.py
 @@ -21,6 +21,7 @@ import tempfile
  import shutil
  import subprocess
@@ -95,7 +95,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
  
  import gtweak
  from gtweak.gsettings import GSettingsSetting
-@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, bl
+@@ -116,6 +117,22 @@ def execute_subprocess(cmd_then_args, block=True):
          stdout, stderr = p.communicate()
          return stdout, stderr, p.returncode
  
@@ -118,3 +118,6 @@ Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
  @singleton
  class AutostartManager:
  
+-- 
+2.12.2
+
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
similarity index 72%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
index 5ddc13949cba..40c0969d5880 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
@@ -1,6 +1,6 @@
-From 22b948c39b32fb45066c4f5a9f99082094fea3d1 Mon Sep 17 00:00:00 2001
+From 25c047ac6a2ac892e2be3d7e002fbf7a16725a4c Mon Sep 17 00:00:00 2001
 From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sat, 1 Aug 2015 21:26:57 +0200
+Date: Sun, 25 Jun 2017 11:35:10 +0100
 Subject: [PATCH 2/3] Don't show multiple entries for a single theme
 
 ---
@@ -9,10 +9,10 @@ Subject: [PATCH 2/3] Don't show multiple entries for a single theme
  gtweak/utils.py                        | 16 ++++++++++++++++
  3 files changed, 22 insertions(+), 6 deletions(-)
 
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_interface.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
+diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
+index db89b85..4697fe3 100644
+--- a/gtweak/tweaks/tweak_group_interface.py
++++ b/gtweak/tweaks/tweak_group_interface.py
 @@ -26,7 +26,7 @@ from gi.repository import Gtk
  from gi.repository import GLib
  
@@ -22,7 +22,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
  from gtweak.gshellwrapper import GnomeShellFactory
  from gtweak.gsettings import GSettingsSetting
-@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTwe
+@@ -54,7 +54,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
                      os.path.exists(os.path.join(d, "gtk-2.0")) and \
                          (os.path.exists(os.path.join(d, "gtk-3.0")) or \
                           os.path.exists(os.path.join(d, "gtk-3.{}".format(gtk_ver)))))
@@ -31,7 +31,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  
  class IconThemeSwitcher(GSettingsComboTweak):
      def __init__(self, **options):
-@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTw
+@@ -69,7 +69,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
          valid = walk_directories(get_resource_dirs("icons"), lambda d:
                      os.path.isdir(d) and \
  			os.path.exists(os.path.join(d, "index.theme")))
@@ -40,7 +40,7 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  
  class CursorThemeSwitcher(GSettingsComboTweak):
      def __init__(self, **options):
-@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsCombo
+@@ -84,7 +84,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
          valid = walk_directories(get_resource_dirs("icons"), lambda d:
                      os.path.isdir(d) and \
                          os.path.exists(os.path.join(d, "cursors")))
@@ -49,20 +49,20 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_interface.py
  
  class ShellThemeTweak(Gtk.Box, Tweak):
  
-Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/tweaks/tweak_group_keymouse.py
-+++ gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
+diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
+index b06900c..d34793e 100644
+--- a/gtweak/tweaks/tweak_group_keymouse.py
++++ b/gtweak/tweaks/tweak_group_keymouse.py
+@@ -21,7 +21,7 @@ from gi.repository import GLib
  
  import gtweak
+ from gtweak.gshellwrapper import GnomeShellFactory
 -from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
 +from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
  from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title, GSettingsComboEnumTweak
  
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -51,7 +51,7 @@ class KeyThemeSwitcher(GSettingsComboTwe
+ _shell = GnomeShellFactory().get_shell()
+@@ -44,7 +44,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
          valid = walk_directories(get_resource_dirs("themes"), lambda d:
                      os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
                      os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
@@ -71,10 +71,10 @@ Index: gnome-tweak-tool-3.20.1/gtweak/tweaks/tweak_group_keymouse.py
  
  TWEAK_GROUPS = [
      ListBoxTweakGroup(_("Keyboard and Mouse"),
-Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
-===================================================================
---- gnome-tweak-tool-3.20.1.orig/gtweak/utils.py
-+++ gnome-tweak-tool-3.20.1/gtweak/utils.py
+diff --git a/gtweak/utils.py b/gtweak/utils.py
+index b0993b6..0d995bc 100644
+--- a/gtweak/utils.py
++++ b/gtweak/utils.py
 @@ -133,6 +133,22 @@ def get_resource_dirs(resource):
  
      return [dir for dir in dirs if os.path.isdir(dir)]
@@ -98,3 +98,6 @@ Index: gnome-tweak-tool-3.20.1/gtweak/utils.py
  @singleton
  class AutostartManager:
  
+-- 
+2.12.2
+
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
similarity index 69%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
index b25b2d6dc4aa..5082a55387a8 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
@@ -1,19 +1,17 @@
-From cdafa01dc90da486d0114b423e3e467f7b083d1b Mon Sep 17 00:00:00 2001
+From ba2eb4be6c69ee8206e0139268c896e6a2b278d8 Mon Sep 17 00:00:00 2001
 From: Jascha Geerds <jascha@jgeerds.name>
-Date: Sun, 2 Aug 2015 12:01:20 +0200
+Date: Sun, 25 Jun 2017 11:50:33 +0100
 Subject: [PATCH 3/3] Create config dir if it doesn't exist
 
-Otherwise gnome-tweak-tool can't enable the dark theme and fails
-without a clear error message.
 ---
  gtweak/gtksettings.py | 4 ++++
  1 file changed, 4 insertions(+)
 
 diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py
-index bcec9f1..f39991b 100644
+index a0c163b..f5883ec 100644
 --- a/gtweak/gtksettings.py
 +++ b/gtweak/gtksettings.py
-@@ -35,6 +35,10 @@ class GtkSettingsManager:
+@@ -36,6 +36,10 @@ class GtkSettingsManager:
      def _get_keyfile(self):
          keyfile = None
          try:
@@ -25,5 +23,5 @@ index bcec9f1..f39991b 100644
              keyfile.load_from_file(self._path, 0)
          except MemoryError:
 -- 
-2.7.0
+2.12.2
 
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
similarity index 66%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
index 5a1baa5e3307..1df3c1ffdb7c 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/default.nix
@@ -1,11 +1,9 @@
 { stdenv, intltool, fetchurl, atk
 , pkgconfig, gtk3, glib, libsoup
-, bash, makeWrapper, itstool, libxml2, python2Packages
+, bash, itstool, libxml2, python2Packages
 , gnome3, librsvg, gdk_pixbuf, file, libnotify, gobjectIntrospection, wrapGAppsHook }:
 
-let
-  pythonEnv = python2Packages.python.withPackages ( ps: with ps; [ pygobject3 ] );
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
   doCheck = true;
@@ -15,16 +13,17 @@ in stdenv.mkDerivation rec {
   makeFlags = [ "DESTDIR=/" ];
 
   buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
+                  gnome3.gsettings_desktop_schemas file
                   gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  libnotify gnome3.gnome_shell
+                  libnotify gnome3.gnome_shell python2Packages.pygobject3
                   libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-                  gnome3.gnome_desktop wrapGAppsHook
-                  python2Packages.pygobject3.dev pythonEnv gobjectIntrospection ];
+                  gnome3.gnome_desktop wrapGAppsHook gobjectIntrospection
+                ];
 
-  PYTHONPATH = "$out/${pythonEnv.python.sitePackages}";
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
+  preFixup = ''
+    gappsWrapperArgs+=(
+      --prefix PYTHONPATH : "$out/${python2Packages.python.sitePackages}:$PYTHONPATH")
+  '';
 
   patches = [
     ./find_gsettings.patch
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-tweak-tool/find_gsettings.patch
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/find_gsettings.patch
diff --git a/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
new file mode 100644
index 000000000000..0af83053fa89
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.24/misc/gnome-tweak-tool/src.nix
@@ -0,0 +1,10 @@
+# Autogenerated by maintainers/scripts/gnome.sh update
+
+fetchurl: {
+  name = "gnome-tweak-tool-3.24.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gnome-tweak-tool/3.24/gnome-tweak-tool-3.24.1.tar.xz;
+    sha256 = "19226b374148d660330af9a8341087c2f869bb24355f4dcc87857169eca9f565";
+  };
+}
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gnome-video-effects/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gnome-video-effects/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
similarity index 82%
rename from pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
index 99766ad898e1..2bfc6c73eb40 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gpaste/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala_0_32, glib
+{ stdenv, fetchurl, autoreconfHook, pkgconfig, vala_0_32, glib, gjs, mutter
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper, systemd, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
-  version = "3.20.4";
+  version = "3.24.2";
   name = "gpaste-${version}";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "08h1igdgapz7px12r7mrfcxmz68g9ijg73w69j75spg0yc6f4xax";
+    sha256 = "16142jfpkz8qfs7zp9k3c5l9pnvxbr5yygj8jdpx6by1142s6340";
   };
 
-  buildInputs = [ intltool autoreconfHook pkgconfig vala_0_32 glib
+  buildInputs = [ autoreconfHook pkgconfig vala_0_32 glib gjs mutter
                   gtk3 gnome3.gnome_control_center dbus
                   clutter pango appstream-glib makeWrapper systemd gobjectIntrospection ];
 
-  preConfigure = "intltoolize -f";
-
   configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
                      "--with-dbusservicesdir=$(out)/share/dbus-1/services"
                      "--with-systemduserunitdir=$(out)/etc/systemd/user" ];
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
similarity index 64%
rename from pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
index 3024d3ed59ff..44573d1a5bb1 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gspell/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gspell/default.nix
@@ -3,7 +3,9 @@
 stdenv.mkDerivation rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  buildInputs = [ pkgconfig glib gtk3 enchant isocodes vala ];
+  propagatedBuildInputs = [ enchant ]; # required for pkgconfig
+
+  buildInputs = [ pkgconfig glib gtk3 isocodes vala ];
 
   meta = with stdenv.lib; {
     platforms = platforms.linux;
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
similarity index 65%
rename from pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
index 850e13fb011e..fd55e654d551 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/gspell/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/gspell/src.nix
@@ -1,10 +1,10 @@
 fetchurl: rec {
-  major = "1.2";
+  major = "1.4";
   minor = "1";
   name = "gspell-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gspell/${major}/${name}.tar.xz";
-    sha256 = "18zisdrq14my2iq6iv3lhqfn9jg98bqwbzcdidp7hfk915gkw74z";
+    sha256 = "1ghh1xdzf04mfgb13zqpj88krpa44xv2vbyhm6k017kzrpz8hbs4";
   };
 }
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gtkhtml/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gtkhtml/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix b/pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/gtkhtml/src.nix
rename to pkgs/desktops/gnome-3/3.24/misc/gtkhtml/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/libgames-support/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libgames-support/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/libgda/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libgda/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix b/pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/libgda/src.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libgda/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix b/pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/libgit2-glib/src.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libgit2-glib/src.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
similarity index 82%
rename from pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
index b86480125730..9988541e0f5b 100644
--- a/pkgs/desktops/gnome-3/3.22/misc/libmediaart/default.nix
+++ b/pkgs/desktops/gnome-3/3.24/misc/libmediaart/default.nix
@@ -4,11 +4,11 @@ let
   majorVersion = "1.9";
 in
 stdenv.mkDerivation rec {
-  name = "libmediaart-${majorVersion}.0";
+  name = "libmediaart-${majorVersion}.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz";
-    sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll";
+    sha256 = "0jg9gwxmhdxcbwb5svgkxkd3yl1d14wqzckcgg2swkn81i7al52v";
   };
 
   buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix b/pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/pidgin/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/pidgin/default.nix
diff --git a/pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/3.22/misc/pomodoro/default.nix
rename to pkgs/desktops/gnome-3/3.24/misc/pomodoro/default.nix
diff --git a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
index 8a99932e8307..bda356cf4c37 100644
--- a/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/chrome-gnome-shell/default.nix
@@ -7,24 +7,24 @@ name="chrome-gnome-shell";
     rev = "7d99523e90805cb65027cc2f5f1191a957dcf276";
     sha256 = "0qc34dbhsz5yf4z5bx6py08h561rcxw9928drgk9256g3vnygnbc";
   };
- 
+
  buildInputs = [ gnome3.gnome_shell makeWrapper jq dbus gobjectIntrospection
  python python27Packages.requests python27Packages.pygobject3 wrapGAppsHook];
 
  preConfigure = ''
- mkdir build usr etc
- cd build
- ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../
- substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc"  
+   mkdir build usr etc
+   cd build
+   ${cmake}/bin/cmake -DCMAKE_INSTALL_PREFIX=$out/usr -DBUILD_EXTENSION=OFF ../
+   substituteInPlace cmake_install.cmake --replace "/etc" "$out/etc"
  '';
 
  postInstall = ''
     rm $out/etc/opt/chrome/policies/managed/chrome-gnome-shell.json
     rm $out/etc/chromium/policies/managed/chrome-gnome-shell.json
     wrapProgram $out/usr/bin/chrome-gnome-shell \
-      --prefix PATH '"${dbus}/bin/dbus:$PATH"' \
-      --prefix PATH '"${gnome3.gnome_shell}:$PATH"' \
-      --prefix PYTHONPATH : "$PYTHONPATH" 
+      --prefix PATH : '"${dbus}/bin"' \
+      --prefix PATH : '"${gnome3.gnome_shell}/bin"' \
+      --prefix PYTHONPATH : "$PYTHONPATH"
 
   '';
 
diff --git a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
index 4d5b29f6cc61..4d788e909e2d 100644
--- a/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
+++ b/pkgs/desktops/gnome-3/extensions/dash-to-dock/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "gnome-shell-dash-to-dock-${version}";
-  version = "v57";
+  version = "v60";
 
   src = fetchFromGitHub {
     owner = "micheleg";
     repo = "dash-to-dock";
-    rev = "97f6a0bb95b9f87d7a34a074c9b3624b65111794";
-    sha256 = "0b9i89hpn9k63zcrbl4bhs7qfb70wh09870fwv2ik7hajm64kynn";
+    rev = "extensions.gnome.org-" + version;
+    sha256 = "0w9km1zcxcskrsfr392zx945k227qajnw09pxc20d1vwv78wlgy3";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix
index 45be1d8710d7..3967a8c9ca2b 100644
--- a/pkgs/desktops/mate/mate-themes/default.nix
+++ b/pkgs/desktops/mate/mate-themes/default.nix
@@ -4,7 +4,8 @@
 stdenv.mkDerivation rec {
   name = "mate-themes-${version}";
   version = "${major-ver}.${minor-ver}";
-  major-ver = gnome3.version;
+  # There is no 3.24 release.
+  major-ver = if stdenv.lib.versionOlder gnome3.version "3.23" then gnome3.version else "3.22";
   minor-ver = {
     "3.20" = "22";
     "3.22" = "13";
diff --git a/pkgs/development/libraries/appstream-glib/default.nix b/pkgs/development/libraries/appstream-glib/default.nix
index 03853192531e..4230e1e7d6e2 100644
--- a/pkgs/development/libraries/appstream-glib/default.nix
+++ b/pkgs/development/libraries/appstream-glib/default.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchFromGitHub, pkgconfig, gettext, gtk3, intltool, glib
 , gtk_doc, autoconf, automake, libtool, libarchive, libyaml
 , gobjectIntrospection, sqlite, libsoup, gcab, attr, acl, docbook_xsl
-, libuuid, json_glib, autoconf-archive
+, libuuid, json_glib, autoconf-archive, gperf
 }:
 
 stdenv.mkDerivation rec {
-  name = "appstream-glib-0.6.3";
+  name = "appstream-glib-0.6.13";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "appstream-glib";
     rev = stdenv.lib.replaceStrings ["." "-"] ["_" "_"] name;
-    sha256 = "12l0vzhi9vpyrnf7vrpq21rb26mb6yskp5zgngdjyjanwhzmc617";
+    sha256 = "1csscszdp1imd0hiib6xx7mfylfl1r64xmma14p5jq1yprprpa9h";
   };
 
   nativeBuildInputs = [ autoconf automake libtool pkgconfig intltool autoconf-archive ];
   buildInputs = [ glib gtk_doc gettext sqlite libsoup
                   gcab attr acl docbook_xsl libuuid json_glib
-                  libarchive libyaml gobjectIntrospection ];
+                  libarchive libyaml gobjectIntrospection gperf ];
   propagatedBuildInputs = [ gtk3 ];
   configureScript = "./autogen.sh";
 
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 545612d5c155..54a844876711 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.24";
+  name = "babl-0.1.28";
 
   src = fetchurl {
     url = "http://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "02wxyaa9kjfypmg31avp2dxh16sfx9701ww6dmp0ggz5vnng2as7";
+    sha256 = "00w6xfcv960c98qvxv81gcbj8l1jiab9sggmdl77m19awwiyvwv3";
   };
 
   meta = with stdenv.lib; { 
diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix
index 41c7f8db6d26..2b5f7069681c 100644
--- a/pkgs/development/libraries/clutter-gst/default.nix
+++ b/pkgs/development/libraries/clutter-gst/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   major = "3.0";
-  minor = "20";
+  minor = "24";
   name = "clutter-gst-${major}.${minor}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter-gst/${major}/${name}.tar.xz";
-    sha256 = "1jb6q0f6vbh8nskz88siny70pm43wbnw2wzr2klsyb9axn3if0d0";
+    sha256 = "0v6cg0syh4vx7y7ni47jsvr2r57q0j3h1f1gjlp0ciscixywiwg9";
   };
 
   propagatedBuildInputs = [ clutter gtk3 glib cogl ];
diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index a0479d9d73c3..3292c8e353fe 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,25 +1,25 @@
 { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
+, libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, 
 gobjectIntrospection, gtk3
 }:
 
 let
   ver_maj = "1.26";
-  ver_min = "0";
+  ver_min = "2";
 in
 stdenv.mkDerivation rec {
   name = "clutter-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz";
-    sha256 = "01nfjd4k7j2n3agpx2d9ncff86nfsqv4n23465rb9zmk4iw4wlb7";
+    sha256 = "0mif1qnrpkgxi43h7pimim6w6zwywa16ixcliw0yjm9hk0a368z7";
   };
 
   buildInputs = [ gtk3 ];
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib gobjectIntrospection
+      atk json_glib gobjectIntrospection libxcb
     ];
 
   configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK
diff --git a/pkgs/development/libraries/gegl/3.0.nix b/pkgs/development/libraries/gegl/3.0.nix
index df68eecd137b..48b1e47e0edc 100644
--- a/pkgs/development/libraries/gegl/3.0.nix
+++ b/pkgs/development/libraries/gegl/3.0.nix
@@ -2,11 +2,11 @@
 , librsvg, pango, gtk, bzip2, json_glib, intltool, autoreconfHook, libraw }:
 
 stdenv.mkDerivation rec {
-  name = "gegl-0.3.6";
+  name = "gegl-0.3.18";
 
   src = fetchurl {
     url = "http://download.gimp.org/pub/gegl/0.3/${name}.tar.bz2";
-    sha256 = "08m7dlf2kwmp7jw3qskwxas192swhn1g4jcd8aldg9drfjygprvh";
+    sha256 = "1ywihjav9yhmsvbrdyx9c5q71rqdkjg8l66ywca6s4yydvr8x1fp";
   };
 
   hardeningDisable = [ "format" ];
diff --git a/pkgs/development/libraries/geoclue/default.nix b/pkgs/development/libraries/geoclue/default.nix
index 9aba42fdf4bf..433a1722e76f 100644
--- a/pkgs/development/libraries/geoclue/default.nix
+++ b/pkgs/development/libraries/geoclue/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2, libxslt }:
+{ stdenv, fetchurl, dbus, dbus_glib, glib, pkgconfig, libxml2, gnome2,
+  libxslt, glib_networking }:
 
 stdenv.mkDerivation rec {
   name = "geoclue-0.12.0";
@@ -7,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "15j619kvmdgj2hpma92mkxbzjvgn8147a7500zl3bap9g8bkylqg";
   };
 
-  buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt ];
+  buildInputs = [ pkgconfig libxml2 gnome2.GConf libxslt glib_networking ];
 
   propagatedBuildInputs = [dbus glib dbus_glib];
 
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 071941d66c32..e76e48ad8fc0 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -43,7 +43,7 @@ let
   '';
 
   ver_maj = "2.52";
-  ver_min = "1";
+  ver_min = "3";
 in
 
 stdenv.mkDerivation rec {
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${ver_maj}/${name}.tar.xz";
-    sha256 = "948c26b817f2d77e2a6cdd5082c60a51bf5dea854890286a1d5d4ccde5ce586f";
+    sha256 = "0a71wkkhkvad84gm30w13micxxgqqw3sxhybj7nd9z60lwspdvi5";
   };
 
   patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch;
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index 4773cc380002..4c1f6135b495 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -7,8 +7,8 @@
 # In that case its about 6MB which could be separated
 
 let
-  ver_maj = "1.50";
-  ver_min = "0";
+  ver_maj = "1.52";
+  ver_min = "1";
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/gobject-introspection/${ver_maj}/${name}.tar.xz";
-    sha256 = "1c6597c666f543c70ef3d7c893ab052968afae620efdc080c36657f4226337c5";
+    sha256 = "1x5gkyrglv3dn9b4fsgw6asqgjw1wj7qc37g9pyac6pyaa6w7l1f";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 4037de5a9cf7..67302f330b9d 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite
-, clutter_gtk, libsoup /*, libmemphis */ }:
+, clutter_gtk, libsoup, gobjectIntrospection /*, libmemphis */ }:
 
 stdenv.mkDerivation rec {
   major = "0.12";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "13snnka1jqc5qrgij8bm22xy02pncf3dn5ij3jh4rrpzq7g1sqpi";
   };
 
-  buildInputs = [ pkgconfig ];
+  buildInputs = [ pkgconfig gobjectIntrospection ];
 
   propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];
 
diff --git a/pkgs/development/python-modules/adal/default.nix b/pkgs/development/python-modules/adal/default.nix
index 22ed76b9e59c..4673e5461d3a 100644
--- a/pkgs/development/python-modules/adal/default.nix
+++ b/pkgs/development/python-modules/adal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonPackage, fetchPypi
-, requests, pyjwt }:
+, requests, pyjwt, dateutil }:
 
 buildPythonPackage rec {
   pname = "adal";
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     sha256 = "7c5bbf4d8a17d535e6e857b28a41cedddc2767fc57424c15d484fa779bb97325";
   };
 
-  propagatedBuildInputs =  [ requests pyjwt ];
+  propagatedBuildInputs =  [ requests pyjwt dateutil ];
 
   meta = with stdenv.lib; {
     description = "Library to make it easy for python application to authenticate to Azure Active Directory (AAD) in order to access AAD protected web resources";
diff --git a/pkgs/development/python-modules/pygobject/3.nix b/pkgs/development/python-modules/pygobject/3.nix
index 984b11844342..ce7210391c60 100644
--- a/pkgs/development/python-modules/pygobject/3.nix
+++ b/pkgs/development/python-modules/pygobject/3.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, buildPythonPackage, python, pkgconfig, glib, gobjectIntrospection, pycairo, cairo, which, ncurses}:
 
 buildPythonPackage rec {
-  major = "3.22";
-  minor = "0";
+  major = "3.24";
+  minor = "1";
   name = "pygobject-${major}.${minor}";
   format = "other";
 
   src = fetchurl {
     url = "mirror://gnome/sources/pygobject/${major}/${name}.tar.xz";
-    sha256 = "08b29cfb08efc80f7a8630a2734dec65a99c1b59f1e5771c671d2e4ed8a5cbe7";
+    sha256 = "1zdzznrj2s1gsrv2z4r0n88fzba8zjc1n2r313xi77lhl1daja56";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/tools/misc/colord/default.nix b/pkgs/tools/misc/colord/default.nix
index 222b04db0d0c..46f3786a6df3 100644
--- a/pkgs/tools/misc/colord/default.nix
+++ b/pkgs/tools/misc/colord/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, bash-completion
 , glib, polkit, pkgconfig, intltool, gusb, libusb1, lcms2, sqlite, systemd, dbus
-, gtk_doc, gobjectIntrospection, argyllcms
+, gtk_doc, gobjectIntrospection, argyllcms, autoreconfHook
 , libgudev, sane-backends }:
 
 stdenv.mkDerivation rec {
@@ -10,9 +10,16 @@ stdenv.mkDerivation rec {
     url = "http://www.freedesktop.org/software/colord/releases/${name}.tar.xz";
     sha256 = "0flcsr148xshjbff030pgyk9ar25an901m9q1pjgjdvaq5j1h96m";
   };
+   nativeBuildInputs = [ autoreconfHook intltool ];
 
   enableParallelBuilding = true;
 
+  # Version mismatch requires intltoolize to overwrite
+  # with newer version.
+  preConfigure = ''
+    intltoolize --force
+  '';
+
   configureFlags = [
     "--enable-sane"
     "--with-udevrulesdir=$(out)/lib/udev/rules.d"
@@ -21,12 +28,13 @@ stdenv.mkDerivation rec {
     "--disable-bash-completion"
   ];
 
+
   # don't touch /var at install time, colord creates what it needs at runtime
   postPatch = ''
     sed -e "s|if test -w .*;|if false;|" -i src/Makefile.{am,in}
   '';
 
-  buildInputs = [ glib polkit pkgconfig intltool gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
+  buildInputs = [ glib polkit pkgconfig gusb libusb1 lcms2 sqlite systemd dbus gobjectIntrospection
                   bash-completion argyllcms libgudev sane-backends ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e51bc545aec8..f76948f70868 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17749,9 +17749,9 @@ with pkgs;
     libcanberra = self.libcanberra_gtk2;
   });
 
-  gnome3_22 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.22 { });
+  gnome3_24 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.24 { });
 
-  gnome3 = gnome3_22;
+  gnome3 = gnome3_24;
 
   gnomeExtensions = {
     caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { };

From 3247c940e06d20d2f01fd315e9bda7295d8cb40e Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 28 Aug 2017 15:55:05 +0100
Subject: [PATCH 67/75] gnome-photos: 3.24.2 -> -3.24.3

---
 pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
index 78f3b7d672a3..204897f6d363 100644
--- a/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
+++ b/pkgs/desktops/gnome-3/3.24/apps/gnome-photos/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-photos-3.24.2";
+  name = "gnome-photos-3.24.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.2.tar.xz;
-    sha256 = "31ddc078ad2f6bc4bbfa2f71eb23377782750b9cb2ad2b0e6ff2a1971548cdf9";
+    url = mirror://gnome/sources/gnome-photos/3.24/gnome-photos-3.24.3.tar.xz;
+    sha256 = "cd365629ce584d223c023676a88b6194012bbc561c4a4b1c8eca462425e76288";
   };
 }

From 932b1673219a1c46becb024c65c38262cd5a7a8c Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 28 Aug 2017 15:56:04 +0100
Subject: [PATCH 68/75] Fix indentation.

---
 nixos/modules/services/x11/display-managers/gdm.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index 0e3b05cc5925..bd16f2210592 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -119,12 +119,12 @@ in
 
     systemd.services.display-manager.conflicts = [ "getty@tty1.service" ];
     systemd.services.display-manager.serviceConfig = {
-        # Restart = "always"; - already defined in xserver.nix
-        KillMode = "mixed";
-        IgnoreSIGPIPE = "no";
-        BusName = "org.gnome.DisplayManager";
-        StandardOutput = "syslog";
-        StandardError = "inherit";
+      # Restart = "always"; - already defined in xserver.nix
+      KillMode = "mixed";
+      IgnoreSIGPIPE = "no";
+      BusName = "org.gnome.DisplayManager";
+      StandardOutput = "syslog";
+      StandardError = "inherit";
     };
 
     systemd.services.display-manager.path = [ gnome3.gnome_session ];

From f9f9749fd2a7b75bea9660a60634965de98bac88 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 31 Jul 2017 22:14:17 +0200
Subject: [PATCH 69/75] libarchive: 3.3.1 -> 3.3.2

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

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 883273f188c8..fb1faf8d1b1b 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -10,11 +10,11 @@ assert xarSupport -> libxml2 != null;
 
 stdenv.mkDerivation rec {
   name = "libarchive-${version}";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchurl {
     url = "${meta.homepage}/downloads/${name}.tar.gz";
-    sha256 = "1rr40hxlm9vy5z2zb5w7pyfkgd1a4s061qapm83s19accb8mpji9";
+    sha256 = "1km0mzfl6in7l5vz9kl09a88ajx562rw93ng9h2jqavrailvsbgd";
   };
 
   outputs = [ "out" "lib" "dev" ];

From 0f043d497d0e736eef217e77e4164cf4bb6f455d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 24 Aug 2017 20:27:14 +0200
Subject: [PATCH 70/75] unbound: 1.6.4 -> 1.6.5

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

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 5b6b2ee7ba70..a65ccb0541c8 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.6.4";
+  version = "1.6.5";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "1vbzfzp932nhii5vq7z7rpczdyv624p17sy9hj1cn763ds0qh2nz";
+    sha256 = "0khhrj11yhh6a0h578w29yw2j7yzvaqkr4p44jzjapq1549am5z2";
   };
 
   outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB

From d269d8dbd62b053d6721b7b474651240a3c4d141 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 28 Aug 2017 19:50:59 +0100
Subject: [PATCH 71/75] Uppercase GNOME version.

---
 nixos/doc/manual/release-notes/rl-1709.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index a8932a90803c..e4fa3ea24299 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -12,7 +12,7 @@ has the following highlights: </para>
 <itemizedlist>
   <listitem>
     <para>
-      The Gnome version is now 3.24.
+      The GNOME version is now 3.24.
     </para>
   </listitem>
   <listitem>

From 64e4b9637bdb2d616a696f6b7af545dae963e471 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 28 Aug 2017 19:52:06 +0100
Subject: [PATCH 72/75] Remove unused gdm/3.16-wip

---
 .../3.24/core/gdm/3.16-wip/default.nix        | 41 ---------
 .../3.16-wip/disable_x_access_control.patch   | 15 ----
 .../3.24/core/gdm/3.16-wip/sessions_dir.patch | 17 ----
 .../3.24/core/gdm/3.16-wip/xserver_path.patch | 83 -------------------
 4 files changed, 156 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch

diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
deleted file mode 100644
index 51b67afb01fd..000000000000
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gdm-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3";
-  };
-
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
-    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
-    substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
-    sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
- '';
-
-  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-                     "--with-initial-vt=10" ];
-
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool
-                  accountsservice gnome3.dconf systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool ];
-
-  #enableParallelBuilding = true; # problems compiling
-
-  # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
-    description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
deleted file mode 100644
index 7691a9e86f0f..000000000000
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/disable_x_access_control.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gdm-3.16.0/daemon/gdm-display.c.orig	2015-04-08 13:53:14.370274369 +0200
-+++ gdm-3.16.0/daemon/gdm-display.c	2015-04-08 13:53:36.287520435 +0200
-@@ -1706,9 +1706,10 @@
- 
-                 gdm_error_trap_push ();
- 
--                for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-+                /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-                         XAddHost (self->priv->x11_display, &host_entries[i]);
--                }
-+                }*/
-+                XDisableAccessControl(self->priv->x11_display);
- 
-                 XSync (self->priv->x11_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
deleted file mode 100644
index b8fbad4d731d..000000000000
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/sessions_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                NULL,
-                 NULL
-         };
- 
-+        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
-         return search_dirs;
- }
- 
diff --git a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
deleted file mode 100644
index b451d129391a..000000000000
--- a/pkgs/desktops/gnome-3/3.24/core/gdm/3.16-wip/xserver_path.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
- 
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- }
- 
- static gboolean
---- gdm-3.16.0/daemon/gdm-x-session.c.orig	2015-04-15 18:44:16.875743928 +0200
-+++ gdm-3.16.0/daemon/gdm-x-session.c	2015-04-16 13:34:02.335708638 +0200
-@@ -207,6 +207,8 @@
-         char     *display_fd_string = NULL;
-         char     *vt_string = NULL;
-         char     *display_number;
-+        int nixos_argc = 0;
-+        char **nixos_argv = NULL;
-         gsize     display_number_size;
- 
-         auth_file = prepare_auth_file ();
-@@ -236,7 +238,15 @@
- 
-         display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
- 
--        g_ptr_array_add (arguments, X_SERVER);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+                int i = 0;
-+                g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL);
-+                for (i = 0; i < nixos_argc; i++) {
-+                        g_ptr_array_add (arguments, nixos_argv[i]);
-+                }
-+        } else {
-+                g_ptr_array_add (arguments, X_SERVER);
-+        }
- 
-         if (vt_string != NULL) {
-                 g_ptr_array_add (arguments, vt_string);
-@@ -259,12 +269,12 @@
-         g_ptr_array_add (arguments, "-noreset");
-         g_ptr_array_add (arguments, "-keeptty");
- 
--        g_ptr_array_add (arguments, "-verbose");
-+        /*g_ptr_array_add (arguments, "-verbose");
-         if (state->debug_enabled) {
-                 g_ptr_array_add (arguments, "7");
-         } else {
-                 g_ptr_array_add (arguments, "3");
--        }
-+        }*/
- 
-         if (state->debug_enabled) {
-                 g_ptr_array_add (arguments, "-core");
-@@ -275,6 +285,9 @@
-                                                    (const char * const *) arguments->pdata,
-                                                    &error);
-         g_free (display_fd_string);
-+        if (nixos_argv) {
-+                 g_strfreev (nixos_argv);
-+        }
-         g_clear_object (&launcher);
-         g_ptr_array_free (arguments, TRUE);
- 
---- gdm-3.16.0/daemon/gdm-session.c.orig	2015-04-16 14:19:01.392802683 +0200
-+++ gdm-3.16.0/daemon/gdm-session.c	2015-04-16 14:20:36.012296764 +0200
-@@ -2359,6 +2359,12 @@
-         gchar *desktop_names;
-         const char *locale;
- 
-+        if (g_getenv ("GDM_X_SERVER") != NULL) {
-+                gdm_session_set_environment_variable (self,
-+                                                      "GDM_X_SERVER",
-+                                                      g_getenv ("GDM_X_SERVER"));
-+        }
-+
-         gdm_session_set_environment_variable (self,
-                                               "GDMSESSION",
-                                               get_session_name (self));

From 6dc4b5229bd85156169be39be376bb85a5fccd0f Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 28 Aug 2017 19:58:49 +0100
Subject: [PATCH 73/75] Fix ibus by using a python.buildEnv.

---
 pkgs/tools/inputmethods/ibus/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index d392777dfd44..66d61b8c5e9d 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -48,6 +48,9 @@ let
       sha256 = "1a3qzsab7vzjqpdialp1g8ppr21x05v0ph8ngyq9pyjkx4vzcdi7";
     };
   };
+  pyEnv = python3.buildEnv.override {
+    extraLibs = [ python3.pkgs.pygobject3 ];
+  };
 in stdenv.mkDerivation rec {
   name = "ibus-${version}";
   version = "1.5.16";
@@ -77,16 +80,16 @@ in stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    python3
+    pyEnv
     intltool isocodes pkgconfig
     gtk2 gtk3 dconf
     json_glib
     dbus libnotify gobjectIntrospection wayland
   ];
 
-  propagatedBuildInputs = [ glib python3.pkgs.pygobject3 ];
+  propagatedBuildInputs = [ glib ];
 
-  nativeBuildInputs = [ wrapGAppsHook python3.pkgs.wrapPython ];
+  nativeBuildInputs = [ wrapGAppsHook ];
 
   outputs = [ "out" "dev" ];
 
@@ -104,11 +107,6 @@ in stdenv.mkDerivation rec {
     substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
   '';
 
-  postFixup = ''
-    buildPythonPath $out
-    patchPythonScript $out/share/ibus/setup/main.py
-  '';
-
   doInstallCheck = true;
   installCheckPhase = "$out/bin/ibus version";
 

From 7a22c01b546fb14c9fec8ab1f9bcba2845e354b7 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 10 Aug 2017 18:57:42 -0400
Subject: [PATCH 74/75] apple misc pkgs: `buildInputs` -> `nativeBuildInputs`

---
 .../darwin/apple-source-releases/ICU/default.nix            | 2 +-
 .../darwin/apple-source-releases/Libc/825_40_1.nix          | 4 ++--
 .../darwin/apple-source-releases/Libc/default.nix           | 2 +-
 .../darwin/apple-source-releases/Libsystem/default.nix      | 2 +-
 .../darwin/apple-source-releases/adv_cmds/default.nix       | 3 ++-
 .../darwin/apple-source-releases/bootstrap_cmds/default.nix | 4 ++--
 .../darwin/apple-source-releases/bsdmake/default.nix        | 6 +++---
 .../darwin/apple-source-releases/configd/default.nix        | 3 ++-
 pkgs/os-specific/darwin/cctools/port.nix                    | 3 ++-
 9 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
index a9d06fc9dbc3..2d098418f030 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -1,7 +1,7 @@
 { stdenv, cctools, appleDerivation }:
 
 appleDerivation {
-  buildInputs = [ cctools ];
+  nativeBuildInputs = [ cctools ];
 
   postPatch = ''
     substituteInPlace makefile \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
index b5e7e5123930..0fa9294f2290 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/825_40_1.nix
@@ -3,7 +3,7 @@
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
 
-  buildInputs = [ ed unifdef ];
+  nativeBuildInputs = [ ed unifdef ];
 
   installPhase = ''
     export SRCROOT=$PWD
@@ -12,4 +12,4 @@ appleDerivation {
     export PRIVATE_HEADERS_FOLDER_PATH=include
     bash xcodescripts/headers.sh
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
index ce04be0e0836..40237b27bd26 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libc/default.nix
@@ -3,7 +3,7 @@
 appleDerivation {
   phases = [ "unpackPhase" "installPhase" ];
 
-  buildInputs = [ ed unifdef ];
+  nativeBuildInputs = [ ed unifdef ];
 
   # TODO: asl.h actually comes from syslog project now
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index e3583b3bf84a..caef875ac136 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -5,7 +5,7 @@
 appleDerivation rec {
   phases = [ "unpackPhase" "installPhase" ];
 
-  buildInputs = [ cpio ];
+  nativeBuildInputs = [ cpio ];
 
   installPhase = ''
     export NIX_ENFORCE_PURITY=
diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
index b8b436efe24f..ccbd8343e0d0 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
@@ -16,7 +16,8 @@ let recentAdvCmds = fetchzip {
 };
 
 in appleDerivation {
-  buildInputs = [ bsdmake perl yacc flex ];
+  nativeBuildInputs = [ bsdmake perl yacc flex ];
+  buildInputs = [ flex ];
 
   patchPhase = ''
     substituteInPlace BSDmakefile \
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
index 8dce3fd36097..408a2c7524c3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/bootstrap_cmds/default.nix
@@ -1,7 +1,7 @@
 { stdenv, appleDerivation, yacc, flex }:
 
 appleDerivation {
-  buildInputs = [ yacc flex ];
+  nativeBuildInputs = [ yacc flex ];
 
   buildPhase = ''
     cd migcom.tproj
@@ -41,4 +41,4 @@ appleDerivation {
       --replace '/bin/rmdir' "rmdir" \
       --replace 'C=''${MIGCC}' "C=cc"
   '';
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
index dcbf8b433088..77123d0057d3 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/bsdmake/default.nix
@@ -1,7 +1,7 @@
 { stdenv, appleDerivation, fetchurl, fetchpatch, makeWrapper }:
 
 appleDerivation {
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
   patchPhase = ''
     substituteInPlace mk/bsd.prog.mk \
@@ -27,9 +27,9 @@ appleDerivation {
     for file in $(find . -name '*.c'); do
       obj="$(basename "$file" .c).o"
       objs+=("$obj")
-      cc -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g
+      $CC -c "$file" -o "$obj" -DDEFSHELLNAME='"sh"' -D__FBSDID=__RCSID -mdynamic-no-pic -g
     done
-    cc "''${objs[@]}" -o bsdmake
+    $CC "''${objs[@]}" -o bsdmake
   '';
 
   installPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
index 24797fc286a7..2b31b0420402 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
@@ -3,7 +3,8 @@
 appleDerivation {
   meta.broken = stdenv.cc.nativeLibc;
 
-  buildInputs = [ launchd bootstrap_cmds ppp IOKit eap8021x ];
+  nativeBuildInputs = [ bootstrap_cmds ];
+  buildInputs = [ launchd ppp IOKit eap8021x ];
 
   propagatedBuildInputs = [ Security ];
 
diff --git a/pkgs/os-specific/darwin/cctools/port.nix b/pkgs/os-specific/darwin/cctools/port.nix
index 515471007527..1f2e7c143780 100644
--- a/pkgs/os-specific/darwin/cctools/port.nix
+++ b/pkgs/os-specific/darwin/cctools/port.nix
@@ -29,7 +29,8 @@ let
       sha256 = "0l45mvyags56jfi24rawms8j2ihbc45mq7v13pkrrwppghqrdn52";
     };
 
-    buildInputs = [ autoconf automake libtool_2 libuuid ] ++
+    nativeBuildInputs = [ autoconf automake libtool_2 ];
+    buildInputs = [ libuuid ] ++
       # Only need llvm and clang if the stdenv isn't already clang-based (TODO: just make a stdenv.cc.isClang)
       stdenv.lib.optionals (!stdenv.isDarwin) [ llvm clang ] ++
       stdenv.lib.optionals stdenv.isDarwin [ libcxxabi libobjc ];

From 6e0f61486a80997fd420ede749ebaf6313e78f97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 29 Aug 2017 09:48:13 +0200
Subject: [PATCH 75/75] e17gtk: unbreak evaluation after gnome update

---
 pkgs/misc/themes/e17gtk/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/misc/themes/e17gtk/default.nix b/pkgs/misc/themes/e17gtk/default.nix
index 461c2a98c94b..cdf2d958fe47 100644
--- a/pkgs/misc/themes/e17gtk/default.nix
+++ b/pkgs/misc/themes/e17gtk/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchFromGitHub, gnome3 }:
-
+let
+  gnome3 = { version = "3.22"; }; # FIXME
+in
 stdenv.mkDerivation rec {
   name = "e17gtk-${version}";
   version = "${gnome3.version}.1";