Merge master into staging

2018-10-21 08:38:08 +02:00 · 2018-10-21 08:38:08 +02:00 · b737416019
commit b737416019
parent 38eb13f5c2 86c7662be0
55 changed files with 1077 additions and 628 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -3339,6 +3339,11 @@
    github = "pmyjavec";
    name = "Pauly Myjavec";
  };
+  pnelson = {
+    email = "me@pnelson.ca";
+    github = "pnelson";
+    name = "Philip Nelson";
+  };
  pneumaticat = {
    email = "kevin@potatofrom.space";
    github = "pneumaticat";
--- a/nixos/modules/services/monitoring/prometheus/default.nix
+++ b/nixos/modules/services/monitoring/prometheus/default.nix
@ -39,6 +39,7 @@ let
    "-alertmanager.notification-queue-capacity=${toString cfg.alertmanagerNotificationQueueCapacity}"
    "-alertmanager.timeout=${toString cfg.alertmanagerTimeout}s"
    (optionalString (cfg.alertmanagerURL != []) "-alertmanager.url=${concatStringsSep "," cfg.alertmanagerURL}")
+    (optionalString (cfg.webExternalUrl != null) "-web.external-url=${cfg.webExternalUrl}")
  ];

  promTypes.globalConfig = types.submodule {
@ -467,6 +468,16 @@ in {
          Alert manager HTTP API timeout (in seconds).
        '';
      };
+
+      webExternalUrl = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "https://example.com/";
+        description = ''
+          The URL under which Prometheus is externally reachable (for example,
+          if Prometheus is served via a reverse proxy).
+        '';
+      };
    };
  };

--- a/nixos/modules/services/networking/znc/options.nix
+++ b/nixos/modules/services/networking/znc/options.nix
@ -239,6 +239,7 @@ in
        IPv4 = mkDefault true;
        IPv6 = mkDefault true;
        SSL = mkDefault c.useSSL;
+        URIPrefix = c.uriPrefix;
      };
      User.${c.userName} = {
        Admin = mkDefault true;
@ -254,8 +255,9 @@ in
            listToAttrs (map (n: nameValuePair "#${n}" (mkDefault {})) net.channels);
          extraConfig = if net.extraConf == "" then mkDefault null else net.extraConf;
        }) c.networks;
-        extraConfig = [ c.passBlock ] ++ optional (c.extraZncConf != "") c.extraZncConf;
+        extraConfig = [ c.passBlock ];
      };
+      extraConfig = optional (c.extraZncConf != "") c.extraZncConf;
    };
  };

--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@ -12,11 +12,15 @@ let
    build = "181.5056338";
    sha256Hash = "117skqjax1xz9plarhdnrw2rwprjpybdc7mx7wggxapyy920vv5r";
  };
-  betaVersion = stableVersion;
+  betaVersion = {
+    version = "3.3.0.13"; # "Android Studio 3.3 Beta 1"
+    build = "182.5073496";
+    sha256Hash = "0bg1h0msd6mpkvirkg4pssa1ak32smv2rlxxsjdm3p29p8gg59px";
+  };
  latestVersion = { # canary & dev
-    version = "3.3.0.12"; # "Android Studio 3.3 Canary 13"
-    build = "182.5035453";
-    sha256Hash = "0f2glxm41ci016dv9ygr12s72lc5mh0zsxhpmx0xswg9mdwrvwa7";
+    version = "3.4.0.0"; # "Android Studio 3.4 Canary 1"
+    build = "182.5070326";
+    sha256Hash = "03h2yns8s9dqbbc9agxhidpmziy9g3z89nm3byydw43hdz54hxab";
  };
 in rec {
  # Old alias
--- a/pkgs/applications/editors/thonny/default.nix
+++ b/pkgs/applications/editors/thonny/default.nix
@ -4,16 +4,24 @@ with python3.pkgs;

 buildPythonApplication rec {
  pname = "thonny";
-  version = "3.0.0b3";
+  version = "3.0.1";

  src = fetchFromBitbucket {
    owner = "plas";
    repo = pname;
-    rev = "a511d4539c532b6dddf6d7f1586d30e1ac35bd86";
-    sha256 = "1s3pp97r6p3j81idglnml4faxryk7saszxmv3gys1agdfj75qczr";
+    rev = "f66bd266deda11534561a01ede53cf1b71d2c3c0";
+    sha256 = "0mjskb0gyddybvlbhm10ch1rwzvmci95b018x67bh67bybdl4hm7";
  };

-  propagatedBuildInputs = with python3.pkgs; [ jedi pyserial tkinter docutils pylint ];
+  propagatedBuildInputs = with python3.pkgs; [
+    jedi
+    pyserial
+    tkinter
+    docutils
+    pylint
+    mypy
+    pyperclip
+  ];

  preInstall = ''
    export HOME=$(mktemp -d)
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@ -3,11 +3,11 @@

 stdenv.mkDerivation rec {
  name = "chirp-daily-${version}";
-  version = "20180906";
+  version = "20181009";

  src = fetchurl {
    url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${name}.tar.gz";
-    sha256 = "00cq15892p46z1j1fl2pd17y7k4rc6cfz7gaxb446mshxrvbfgam";
+    sha256 = "1h7i8skdjkz7n6dz3q9pzg1k31nh1ivy2mx3864bjvpkc7m6yyd9";
  };

  nativeBuildInputs = [ makeWrapper ];
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, python3Packages, glfw, libunistring, harfbuzz,
-  fontconfig, pkgconfig, ncurses, imagemagick, xsel,
+{ stdenv, substituteAll, fetchFromGitHub, python3Packages, glfw, libunistring,
+  harfbuzz, fontconfig, pkgconfig, ncurses, imagemagick, xsel,
  libstartup_notification, libX11, libXrandr, libXinerama, libXcursor,
  libxkbcommon, libXi, libXext, wayland-protocols, wayland,
  which, dbus
@ -28,14 +28,12 @@ buildPythonApplication rec {

  outputs = [ "out" "terminfo" ];

-  postPatch = ''
-    substituteInPlace kitty/utils.py \
-      --replace "find_library('startup-notification-1')" "'${libstartup_notification}/lib/libstartup-notification-1.so'"
-
-    substituteInPlace docs/Makefile \
-      --replace 'python3 .. +launch :sphinx-build' \
-                'PYTHONPATH=$PYTHONPATH:.. HOME=$TMPDIR/nowhere sphinx-build'
-    '';
+  patches = [
+    (substituteAll {
+      src = ./fix-paths.patch;
+      libstartup_notification = "${libstartup_notification}/lib/libstartup-notification-1.so";
+    })
+  ];

  buildPhase = ''
    python3 setup.py linux-package
--- a/pkgs/applications/misc/kitty/fix-paths.patch
+++ b/pkgs/applications/misc/kitty/fix-paths.patch
@ -0,0 +1,27 @@
+--- a/kitty/desktop.c
+++ b/kitty/desktop.c
+@@ -30,7 +30,7 @@
+ static PyObject*
+ init_x11_startup_notification(PyObject UNUSED *self, PyObject *args) {
+     static bool done = false;
+-    static const char* libname = "libstartup-notification-1.so";
+    static const char* libname = "@libstartup_notification@";
+     if (!done) {
+         done = true;
+
+--- a/docs/Makefile
+++ b/docs/Makefile
+@@ -3,7 +3,7 @@
+# Patching is needed here for the following reasons:
+# * `sphinx-build` in nixpkgs is not a Python file but a wrapper shell script
+# * importing the `constants` package from Kitty has a side effect that it
+#   creates the user configuration directory. This package gets imported
+#   while sphinx scans the code for documentation strings.
+#
+ # You can set these variables from the command line.
+ SPHINXOPTS    = -T $(FAIL_WARN)
+-SPHINXBUILD   = python3 .. +launch :sphinx-build
+SPHINXBUILD   = PYTHONPATH=${PYTHONPATH}:.. HOME=${TMPDIR}/kitty-build-home sphinx-build
+ SPHINXPROJ    = kitty
+ SOURCEDIR     = .
+ BUILDDIR      = _build
--- a/pkgs/applications/misc/todolist/default.nix
+++ b/pkgs/applications/misc/todolist/default.nix
@ -2,7 +2,7 @@

 buildGoPackage rec {
  name = "todolist-${version}";
-  version = "0.8";
+  version = "v0.8.1";

  goPackagePath = "github.com/gammons/todolist";

@ -10,7 +10,7 @@ buildGoPackage rec {
    owner = "gammons";
    repo = "todolist";
    rev = "${version}";
-    sha256 = "0agv9a44q81qr960b7m1jxk0pb8ahk6lvmzmijvw4v6mbip2720z";
+    sha256 = "0dazfymby5xm4482p9cyj23djmkz5q7g79cqm2d85mczvz7vks8p";
  };

  meta = with stdenv.lib; {
--- a/pkgs/applications/networking/cluster/docker-machine/kvm.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm.nix
@ -3,7 +3,7 @@

 buildGoPackage rec {
  name = "docker-machine-kvm-${version}";
-  version = "0.8.2";
+  version = "0.10.0";

  goPackagePath = "github.com/dhiltgen/docker-machine-kvm";
  goDeps = ./kvm-deps.nix;
@ -12,7 +12,7 @@ buildGoPackage rec {
    rev    = "v${version}";
    owner  = "dhiltgen";
    repo   = "docker-machine-kvm";
-    sha256 = "1p7s340wlcjvna3xa2x13nsnixfhbn5b7dhf9cqvxds2slizlm3p";
+    sha256 = "0ch4zwb6h7hnr5l3skj1daypvpyms2i666lbnmakpw1fw3zvjmgy";
  };

  nativeBuildInputs = [ pkgconfig ];
--- a/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
+++ b/pkgs/applications/networking/cluster/docker-machine/kvm2.nix
@ -1,19 +1,14 @@
-{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig }:
+{ stdenv, buildGoPackage, fetchFromGitHub, libvirt, pkgconfig, minikube }:

 buildGoPackage rec {
  pname = "docker-machine-kvm2";
  name = "${pname}-${version}";
-  version = "0.27.0";
+  version = minikube.version;

  goPackagePath = "k8s.io/minikube";
  subPackages = [ "cmd/drivers/kvm" ];

-  src = fetchFromGitHub {
-    owner = "kubernetes";
-    repo = "minikube";
-    rev = "v${version}";
-    sha256 = "00gj8x5p0vxwy0y0g5nnddmq049h7zxvhb73lb4gii5mghr9mkws";
-  };
+  src = minikube.src;

  nativeBuildInputs = [ pkgconfig ];
  buildInputs = [ libvirt ];
--- a/pkgs/applications/networking/cluster/minishift/default.nix
+++ b/pkgs/applications/networking/cluster/minishift/default.nix
@ -0,0 +1,67 @@
+{ lib, buildGoPackage, fetchFromGitHub, go-bindata, pkgconfig, makeWrapper
+, glib, gtk3, libappindicator-gtk3, gpgme, ostree, libselinux, btrfs-progs
+, lvm2, docker-machine-kvm
+}:
+
+let
+  version = "1.25.0";
+
+  # Update these on version bumps according to Makefile
+  b2dIsoVersion = "v1.3.0";
+  centOsIsoVersion = "v1.12.0";
+  openshiftVersion = "v3.11.0";
+
+in buildGoPackage rec {
+  name = "minishift-${version}";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "minishift";
+    repo = "minishift";
+    rev = "v${version}";
+    sha256 = "12a1irj92lplzkr88g049blpjsdsfwfihs2xix971cq7v0w38fkf";
+  };
+
+  nativeBuildInputs = [ pkgconfig go-bindata makeWrapper ];
+  buildInputs = [ glib gtk3 libappindicator-gtk3 gpgme ostree libselinux btrfs-progs lvm2 ];
+
+  goPackagePath = "github.com/minishift/minishift";
+  subPackages = [ "cmd/minishift" ];
+
+  postPatch = ''
+    substituteInPlace vendor/github.com/containers/image/storage/storage_image.go \
+      --replace 'nil, diff' 'diff'
+  '';
+
+  buildFlagsArray = ''
+    -ldflags=
+      -X ${goPackagePath}/pkg/version.minishiftVersion=${version}
+      -X ${goPackagePath}/pkg/version.b2dIsoVersion=${b2dIsoVersion}
+      -X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}
+      -X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}
+  '';
+
+  preBuild = ''
+    (cd go/src/github.com/minishift/minishift
+      mkdir -p out/bindata
+      go-bindata -prefix addons -o out/bindata/addon_assets.go -pkg bindata addons/...)
+  '';
+
+  postInstall = ''
+    wrapProgram "$bin/bin/minishift" \
+      --prefix PATH ':' '${lib.makeBinPath [ docker-machine-kvm ]}'
+  '';
+
+  meta = with lib; {
+    description = "Run OpenShift locally";
+    longDescription = ''
+      Minishift is a tool that helps you run OpenShift locally by running
+      a single-node OpenShift cluster inside a VM. You can try out OpenShift
+      or develop with it, day-to-day, on your local host.
+    '';
+    homepage = https://github.com/minishift/minishift;
+    maintainers = with maintainers; [ fpletz ];
+    platforms = platforms.linux;
+    license = licenses.asl20;
+  };
+}
--- a/pkgs/applications/networking/cluster/stern/default.nix
+++ b/pkgs/applications/networking/cluster/stern/default.nix
@ -2,7 +2,7 @@

 buildGoPackage rec {
  name = "stern-${version}";
-  version = "1.8.0";
+  version = "1.10.0";

  goPackagePath = "github.com/wercker/stern";

@ -10,7 +10,7 @@ buildGoPackage rec {
    owner = "wercker";
    repo = "stern";
    rev = "${version}";
-    sha256 = "14ccgb41ca2gym7wab0q02ap8g94nhfaihs41qky4wnsfv6j1zc8";
+    sha256 = "05wsif0pwh2v4rw4as36f1d9r149zzp2nyc0z4jwnj9nx58nfpll";
  };

  goDeps = ./deps.nix;
--- a/pkgs/applications/networking/cluster/stern/deps.nix
+++ b/pkgs/applications/networking/cluster/stern/deps.nix
@ -5,8 +5,8 @@
    fetch = {
      type = "git";
      url = "https://code.googlesource.com/gocloud";
-      rev =  "97efc2c9ffd9fe8ef47f7f3203dc60bbca547374";
-      sha256 = "1zf8imq0hgba13rbn260pqf2qd41cg3i4wzzq2i0li3lxnjglkv1";
+      rev =  "dfffe386c33fb24c34ee501e5723df5b97b98514";
+      sha256 = "1g681yxz4mmzapzpzxfaz1nhcr1w526793yapfsnxlbs2skap3fy";
    };
  }
  {
@ -131,8 +131,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/json-iterator/go";
-      rev =  "0ac74bba4a81211b28e32ef260c0f16ae41f1377";
-      sha256 = "07aa3jz9rmhn3cfv06z9549kfpsx4i85qbi3j7q60z2pvasjxqv5";
+      rev =  "f2b4162afba35581b6d4a50d3b8f34e33c144682";
+      sha256 = "0siqfghsm2lkdwinvg8x5gls3p76rq3cdm59c1r4x0b2mdfhnvcd";
    };
  }
  {
@ -176,8 +176,8 @@
    fetch = {
      type = "git";
      url = "https://github.com/modern-go/reflect2";
-      rev =  "05fbef0ca5da472bbf96c9322b84a53edc03c9fd";
-      sha256 = "1jc7xba9v3scsc8fg5nb9g6lrxxgiaaykx8q817arq9b737y90gm";
+      rev =  "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd";
+      sha256 = "1721y3yr3dpx5dx5ashf063qczk2awy5zjir1jvp1h5hn7qz4i49";
    };
  }
  {
@ -225,15 +225,6 @@
      sha256 = "11yxs0wqy70wj106fkz8r923yg4ncnc2mbw33v48zmlg4a1rasgp";
    };
  }
-  {
-    goPackagePath  = "github.com/v2pro/plz";
-    fetch = {
-      type = "git";
-      url = "https://github.com/v2pro/plz";
-      rev =  "10fc95fad3224a032229e59f6e7023137d82b526";
-      sha256 = "0p04pjrz55zn6dbi6l0705prjmhqnmvsvrxzc74hl12wi6r35drp";
-    };
-  }
  {
    goPackagePath  = "golang.org/x/crypto";
    fetch = {
@ -266,8 +257,8 @@
    fetch = {
      type = "git";
      url = "https://go.googlesource.com/sys";
-      rev =  "e4b3c5e9061176387e7cea65e4dc5853801f3fb7";
-      sha256 = "1ijx254fycsnr16m24k7lqvkmdkkrqxsl9mr1kz4mf61a8n0arf9";
+      rev =  "8e24a49d80f82323e1c4db1b5da3e0f31171a151";
+      sha256 = "0zsdnyb8dy98jw6f9yn6g5gdhaqwk39hqridr0mh4dhwvwvlj724";
    };
  }
  {
--- a/pkgs/applications/networking/remote/freerdp/default.nix
+++ b/pkgs/applications/networking/remote/freerdp/default.nix
@ -14,13 +14,13 @@

 stdenv.mkDerivation rec {
  name = "freerdp-${version}";
-  version = "2.0.0-rc2";
+  version = "2.0.0-rc3";

  src = fetchFromGitHub {
    owner  = "FreeRDP";
    repo   = "FreeRDP";
    rev    = version;
-    sha256 = "01cm9g4xqihnnc5d2w1zs8gabkv59p7fyjwi1cwpzv6s198xwbfs";
+    sha256 = "0lpn6klwfnw69imgiibn3mff7lzli2idphgvw5lnradbfw4pr9qc";
  };

  # outputs = [ "bin" "out" "dev" ];
--- a/pkgs/data/fonts/weather-icons/default.nix
+++ b/pkgs/data/fonts/weather-icons/default.nix
@ -0,0 +1,29 @@
+{ stdenv, fetchzip }:
+
+let
+  version = "2.0.10";
+in fetchzip rec {
+  name = "weather-icons-${version}";
+
+  url = "https://github.com/erikflowers/weather-icons/archive/${version}.zip";
+
+  postFetch = ''
+    mkdir -p $out/share/fonts
+    unzip -j $downloadedFile weather-icons-${version}/_docs/font-source/weathericons-regular.otf -d $out/share/fonts/opentype
+  '';
+
+  sha256 = "10zny9987wybq55sm803hrjkp33dq1lgmnxc15kssr8yb81g6qrl";
+
+  meta = with stdenv.lib; {
+    description = "Weather Icons";
+    longDescription = ''
+      Weather Icons is the only icon font and CSS with 222 weather themed icons,
+      ready to be dropped right into Bootstrap, or any project that needs high
+      quality weather, maritime, and meteorological based icons!
+    '';
+    homepage = https://erikflowers.github.io/weather-icons/;
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ pnelson ];
+  };
+}
--- a/pkgs/data/icons/elementary-icon-theme/default.nix
+++ b/pkgs/data/icons/elementary-icon-theme/default.nix
@ -1,23 +1,31 @@
-{ stdenv, fetchurl, cmake, gtk3 }:
+{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3 }:

 stdenv.mkDerivation rec {
  name = "elementary-icon-theme-${version}";
-  version = "4.3.1";
+  version = "5.0";

-  src = fetchurl {
-    url = "https://launchpad.net/elementaryicons/4.x/${version}/+download/${name}.tar.xz";
-    sha256 = "1rp22igvnx71l94j5a6px142329djhk2psm1wfgbhdxbj23hw9kb";
+  src = fetchFromGitHub {
+    owner = "elementary";
+    repo = "icons";
+    rev = version;
+    sha256 = "146s26q4bb5sag35iv42hrnbdciam2ajl7s5s5jayli5vp8bw08w";
  };

-  nativeBuildInputs = [ cmake gtk3 ];
+  nativeBuildInputs = [ meson ninja python3 gtk3 ];

-  postPatch = "cat > volumeicon/CMakeLists.txt";
-  postFixup = "gtk-update-icon-cache $out/share/icons/elementary";
+  postPatch = ''
+    chmod +x meson/symlink.py
+    patchShebangs .
+    sed -i volumeicon/meson.build -e "s,'/','$out',"
+  '';

+  postFixup = ''
+    gtk-update-icon-cache $out/share/icons/elementary
+  '';

  meta = with stdenv.lib; {
-    description = "Elementary icon theme";
-    homepage = https://launchpad.net/elementaryicons;
+    description = "Icons from the Elementary Project";
+    homepage = https://github.com/elementary/icons;
    license = licenses.gpl3;
    platforms = platforms.all;
    maintainers = with maintainers; [ simonvandel ];
--- a/pkgs/development/compilers/factor-lang/default.nix
+++ b/pkgs/development/compilers/factor-lang/default.nix
@ -1,57 +1,58 @@
-{ stdenv, fetchurl, fetchFromGitHub, glib, git,
+{ stdenv, fetchurl, glib, glibc, git,
  rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses,
-  libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext,
-  libGLU, libXmu, libXt, libICE, libSM }:
+  pango, cairo, gtk2, gdk_pixbuf, gtkglext,
+  mesa, xorg, openssl, unzip }:

-stdenv.mkDerivation rec {
+let
+  inherit (stdenv.lib) optional;
+
+in stdenv.mkDerivation rec {
  name = "factor-lang-${version}";
-  version = "0.97";
-  rev = "eb3ca179740e6cfba696b55a999caa13369e6182";
+  version = "0.98";
+  rev = "7999e72aecc3c5bc4019d43dc4697f49678cc3b4";

-  src = fetchFromGitHub {
-    owner = "factor";
-    repo = "factor";
-    rev = rev;
-    sha256 = "16zlbxbad3d19jq01nk824i19bypqzn8l3yfxys40z06vjjncapd";
+  src = fetchurl {
+    url = http://downloads.factorcode.org/releases/0.98/factor-src-0.98.zip;
+    sha256 = "01ip9mbnar4sv60d2wcwfz62qaamdvbykxw3gbhzqa25z36vi3ri";
  };

-  factorimage = fetchurl {
-    url = http://downloads.factorcode.org/releases/0.97/factor-linux-x86-64-0.97.tar.gz;
-    sha256 = "06y125c8vbng54my5fxdr3crpxkvhhcng2n35cxddd3wcg6vhxhp";
-    name = "factorimage";
-  };
+  patches = [
+    ./staging-command-line-0.98-pre.patch
+    ./workdir-0.98-pre.patch
+    ./fuel-dir.patch
+  ];

-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ git rlwrap curl perl makeWrapper
+  buildInputs = with xorg; [ git rlwrap curl pkgconfig perl makeWrapper
    libX11 pango cairo gtk2 gdk_pixbuf gtkglext
-    libGLU libXmu libXt libICE libSM ];
+    mesa libXmu libXt libICE libSM openssl unzip ];

  buildPhase = ''
-    make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev}
+    sed -ie '4i GIT_LABEL = heads/master-${rev}' GNUmakefile
+    make linux-x86-64
+    # De-memoize xdg-* functions, otherwise they break the image.
+    sed -ie 's/^MEMO:/:/' basis/xdg/xdg.factor
  '';

  installPhase = ''
    mkdir -p $out/bin $out/lib/factor
-    # First, get a workable image. Unfortunately, no boot-image
-    # is available with release info. So fetch a released image.
    # The released image has library path info embedded, so we
-    # have to first recreate the boot image with Nix paths, and
+    # first have to recreate the boot image with Nix paths, and
    # then use it to build the Nix release image.
-    zcat ${factorimage} | (cd $out/lib && tar -xvpf - factor/factor.image )
+    cp boot.unix-x86.64.image $out/lib/factor/factor.image

-    cp -r basis core extra unmaintained $out/lib/factor
+    cp -r basis core extra $out/lib/factor

-    # Factor uses the home directory for cache during compilation.
-    # We cant have that. So set it to $TMPDIR/.home
-    export HOME=$TMPDIR/.home && mkdir -p $HOME
+    # Factor uses XDG_CACHE_HOME for cache during compilation.
+    # We can't have that. So set it to $TMPDIR/.cache
+    export XDG_CACHE_HOME=$TMPDIR/.cache && mkdir -p $XDG_CACHE_HOME

-    # there is no ld.so.cache in NixOS so we construct one
+    # There is no ld.so.cache in NixOS so we construct one
    # out of known libraries. The side effect is that find-lib
    # will work only on the known libraries. There does not seem
    # to be a generic solution here.
-    find $(echo ${stdenv.lib.makeLibraryPath [
+    find $(echo ${stdenv.lib.makeLibraryPath (with xorg; [
        glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext
-        libGLU libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst
+        mesa libXmu libXt libICE libSM ])} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst

    (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'";
    for l in $(<$TMPDIR/so.lst);
@ -70,18 +71,29 @@ stdenv.mkDerivation rec {

    cp ./factor $out/bin
    wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \
-      "${stdenv.lib.makeLibraryPath [ glib
+      "${stdenv.lib.makeLibraryPath (with xorg; [ glib
        libX11 pango cairo gtk2 gdk_pixbuf gtkglext
-        libGLU libXmu libXt libICE libSM ]}"
+        mesa libXmu libXt libICE libSM openssl])}"

    sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor
    mv $out/bin/.factor-wrapped $out/lib/factor/factor

-    # make a new bootstrap image
+    # build full factor image from boot image
    (cd $out/bin && ./factor  -script -e='"unix-x86.64" USING: system bootstrap.image memory ; make-image save 0 exit' )
-    mv $out/lib/factor/boot.unix-x86.64.image $out/lib/factor/factor.image
-    # now make the full system image, it overwrites $out/lib/factor/factor.image
-    $out/bin/factor -i=$out/lib/factor/factor.image
+
+    # make a new bootstrap image
+    (cd $out/bin && ./factor  -script -e='"unix-x86.64" USING: system tools.deploy.backend ; make-boot-image 0 exit' )
+
+    # rebuild final full factor image to include all patched sources
+    (cd $out/lib/factor && ./factor -i=boot.unix-x86.64.image)
+
+    # install fuel mode for emacs
+    mkdir -p $out/share/emacs/site-lisp
+    # update default paths in factor-listener.el for fuel mode
+    substituteInPlace misc/fuel/fuel-listener.el \
+      --subst-var-by fuel_factor_root_dir $out/lib/factor \
+      --subst-var-by fuel_listener_factor_binary $out/bin/factor
+    cp misc/fuel/*.el $out/share/emacs/site-lisp/
  '';

  meta = with stdenv.lib; {
@ -89,7 +101,7 @@ stdenv.mkDerivation rec {
    license = licenses.bsd2;
    description = "A concatenative, stack-based programming language";

-    maintainers = [ maintainers.vrthra ];
+    maintainers = [ maintainers.vrthra maintainers.spacefrogg ];
    platforms = [ "x86_64-linux" ];
  };
 }
--- a/pkgs/development/compilers/factor-lang/fuel-dir.patch
+++ b/pkgs/development/compilers/factor-lang/fuel-dir.patch
@ -0,0 +1,20 @@
+diff --git a/misc/fuel/fuel-listener.el b/misc/fuel/fuel-listener.el
+index 2d1b182a75..bf2e573425 100644
+--- a/misc/fuel/fuel-listener.el
+++ b/misc/fuel/fuel-listener.el
+@@ -30,13 +30,13 @@
+   "Interacting with a Factor listener inside Emacs."
+   :group 'fuel)
+ 
+-(defcustom fuel-factor-root-dir nil
+(defcustom fuel-factor-root-dir "@fuel_factor_root_dir@"
+   "Full path to the factor root directory when starting a listener."
+   :type 'directory
+   :group 'fuel-listener)
+ 
+ ;;; Is factor.com still valid on Windows...?
+-(defcustom fuel-listener-factor-binary nil
+(defcustom fuel-listener-factor-binary "@fuel_listener_factor_binary@"
+   "Full path to the factor executable to use when starting a listener."
+   :type '(file :must-match t)
+   :group 'fuel-listener)
--- a/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch
+++ b/pkgs/development/compilers/factor-lang/staging-command-line-0.98-pre.patch
@ -0,0 +1,13 @@
+diff --git a/basis/tools/deploy/backend/backend.factor b/basis/tools/deploy/backend/backend.factor
+index ec86089dbe..b146168ec9 100644
+--- a/basis/tools/deploy/backend/backend.factor
+++ b/basis/tools/deploy/backend/backend.factor
+@@ -69,7 +69,7 @@ ERROR: can't-deploy-library-file library ;
+             [ staging-image-name "-output-image=" prepend , ]
+             [ " " join "-include=" prepend , ] bi
+         ] [
+-            input-image-name "-i=" prepend ,
+            input-image-name resource-path "-i=" prepend ,
+             "-resource-path=" "" resource-path append ,
+             "-run=tools.deploy.restage" ,
+         ] bi
--- a/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch
+++ b/pkgs/development/compilers/factor-lang/workdir-0.98-pre.patch
@ -0,0 +1,24 @@
+diff --git a/core/io/pathnames/pathnames.factor b/core/io/pathnames/pathnames.factor
+index 2d382e49d1..d4d9228d6c 100644
+--- a/core/io/pathnames/pathnames.factor
+++ b/core/io/pathnames/pathnames.factor
+@@ -144,7 +144,10 @@ GENERIC: vocab-path ( path -- newpath )
+ GENERIC: absolute-path ( path -- path' )
+ 
+ M: string absolute-path
+-    "resource:" ?head [
+    "resource:work" ?head [
+        trim-head-separators "/var/lib/factor" prepend-path
+        absolute-path ]
+    [ "resource:" ?head [
+         trim-head-separators resource-path
+         absolute-path
+     ] [
+@@ -158,6 +161,7 @@ M: string absolute-path
+         ] [
+             current-directory get prepend-path
+         ] if ] if
+      ] if
+     ] if ;
+ 
+ M: object normalize-path ( path -- path' )
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@ -218,10 +218,10 @@ in {
  };

  ruby_2_5 = generic {
-    version = rubyVersion "2" "5" "2" "";
+    version = rubyVersion "2" "5" "3" "";
    sha256 = {
-      src = "0wgl1697sdiqh6ksgv40v627jp5557j1zi462krwnzhc9bk408xk";
-      git = "00xy323q2f2v102hfgsj9k20vggvvmyhd6byfhbc1qwz2vyrvc47";
+      src = "0v4442aqqlzxwc792kbkfs2k61qg97r680is6gx20z63a8wd0a4q";
+      git = "0r9mgvqk6gj8pc9q6qmy7j2kbln7drc8wy67sb2ij8ciclcw9nn2";
    };
  };
 }
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@ -11,7 +11,7 @@ rec {
    "${patchSet}/patches/ruby/2.4/head/railsexpress/02-improve-gc-stats.patch"
    "${patchSet}/patches/ruby/2.4/head/railsexpress/03-display-more-detailed-stack-trace.patch"
  ];
-  "2.5.2" = ops useRailsExpress [
+  "2.5.3" = ops useRailsExpress [
    "${patchSet}/patches/ruby/2.5/head/railsexpress/01-fix-broken-tests-caused-by-ad.patch"
    "${patchSet}/patches/ruby/2.5/head/railsexpress/02-improve-gc-stats.patch"
    "${patchSet}/patches/ruby/2.5/head/railsexpress/03-more-detailed-stacktrace.patch"
--- a/pkgs/development/libraries/flatbuffers/default.nix
+++ b/pkgs/development/libraries/flatbuffers/default.nix
@ -2,21 +2,24 @@

 stdenv.mkDerivation rec {
  name = "flatbuffers-${version}";
-  version = "1.8.0";
+  version = "1.10.0";

  src = fetchFromGitHub {
    owner = "google";
    repo = "flatbuffers";
    rev = "v${version}";
-    sha256 = "1qq8qbv8wkiiizj8s984f17bsbjsrhbs9q1nw1yjgrw0grcxlsi9";
+    sha256 = "1b32kc5jp83l43w2gs1dkw2vqm2j0wi7xfxqa86m18n3l41ca734";
  };

-  buildInputs = [ cmake ];
+  preConfigure = stdenv.lib.optional stdenv.buildPlatform.isDarwin ''
+    rm BUILD
+  '';
+
+  nativeBuildInputs = [ cmake ];
  enableParallelBuilding = true;

-  # Not sure how tests are supposed to be run.
-  # "make: *** No rule to make target 'check'.  Stop."
-  doCheck = false;
+  doCheck = true;
+  checkTarget = "test";

  meta = {
    description = "Memory Efficient Serialization Library.";
@ -29,6 +32,6 @@ stdenv.mkDerivation rec {
    maintainers = [ stdenv.lib.maintainers.teh ];
    license = stdenv.lib.licenses.asl20;
    platforms = stdenv.lib.platforms.unix;
-    homepage = http://google.github.io/flatbuffers;
+    homepage = https://google.github.io/flatbuffers/;
  };
 }
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@ -4,7 +4,7 @@
 , libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }:

 let
-  version = "1.0.2";
+  version = "1.0.4";
  desktop_schemas = gnome3.gsettings-desktop-schemas;
 in stdenv.mkDerivation rec {
  name = "flatpak-${version}";
@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
-    sha256 = "0d0nnymb4p3njc24j0p6f74x7cdfi7jac714gxzzz5y5lrd651gn";
+    sha256 = "1x1vqz6k8hhgyr46wg05gwr4zdv313q2hwcwp4nb6n1f7whc7yx0";
  };

  patches = [
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.50/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.51/ -A '*.tar.xz' )
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@ -4,7 +4,7 @@
  karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
  kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
  kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
-  qtbase, qtscript, qtx11extras, solid,
+  qtbase, qtscript, qtx11extras, solid, kcrash
 }:

 mkDerivation {
@ -14,6 +14,7 @@ mkDerivation {
  buildInputs = [
    karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications
    ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras
+    kcrash
  ];
  propagatedBuildInputs = [
    kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@ -3,635 +3,635 @@

 {
  attica = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/attica-5.50.0.tar.xz";
-      sha256 = "0iyaxh92qsh25dl3y18235x9c39jvxgzvfmz96vs5rjkyjnnh88w";
-      name = "attica-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/attica-5.51.0.tar.xz";
+      sha256 = "1lxfrqw6b162sq9254y4hm3gd3w0ck0l4hbi7cgy32rdk0n16sy4";
+      name = "attica-5.51.0.tar.xz";
    };
  };
  baloo = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/baloo-5.50.0.tar.xz";
-      sha256 = "07n90b2mz1d0anknwf271dp2w9hn2kdb0903zqsqnhmix1jqpfy6";
-      name = "baloo-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/baloo-5.51.0.tar.xz";
+      sha256 = "1y10ccji9rlazj4h3zpzzcilf777907kizxlbynqya79h20nzjkq";
+      name = "baloo-5.51.0.tar.xz";
    };
  };
  bluez-qt = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/bluez-qt-5.50.0.tar.xz";
-      sha256 = "028rdw97c042c1xcb2gwa6n4fcpn0wx4ilgh5j584afps6rg2k3b";
-      name = "bluez-qt-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/bluez-qt-5.51.0.tar.xz";
+      sha256 = "1pjkngd9wx0355lv76y5cb7zhmwabinm2pxfz3mf708azml1gsxg";
+      name = "bluez-qt-5.51.0.tar.xz";
    };
  };
  breeze-icons = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/breeze-icons-5.50.0.tar.xz";
-      sha256 = "1zhlylry01w3x72q8ipjgijkicjp3wyv9p183awvg3znkblghhgw";
-      name = "breeze-icons-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/breeze-icons-5.51.0.tar.xz";
+      sha256 = "16wcmjaz25j0jqfcbfww5h873wxb19v36b8dvryhbv38ybx30v6i";
+      name = "breeze-icons-5.51.0.tar.xz";
    };
  };
  extra-cmake-modules = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/extra-cmake-modules-5.50.0.tar.xz";
-      sha256 = "1284gv6l1cck0y6phc9xphs1bl4ayk5a0nwzykhc8ncnkjqb0cyx";
-      name = "extra-cmake-modules-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/extra-cmake-modules-5.51.0.tar.xz";
+      sha256 = "151m4pw97sxwarlx67irrikpmy7183dx0dgg1vrmayssyzidvr4n";
+      name = "extra-cmake-modules-5.51.0.tar.xz";
    };
  };
  frameworkintegration = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/frameworkintegration-5.50.0.tar.xz";
-      sha256 = "14nq6v5xnznc7c7zdfvals4998cmlgdw4i7pz9hfbs35v0pswd03";
-      name = "frameworkintegration-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/frameworkintegration-5.51.0.tar.xz";
+      sha256 = "0bg4avnwxq06xyjxs1fqqb7scx7qpm2rbvcphz1n9mgg4lqwmgbl";
+      name = "frameworkintegration-5.51.0.tar.xz";
    };
  };
  kactivities = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kactivities-5.50.0.tar.xz";
-      sha256 = "0jbri8whf91skxc0zg72bx0m7aym8ka801ncp9kxbjdcj1mbz451";
-      name = "kactivities-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kactivities-5.51.0.tar.xz";
+      sha256 = "0nfmfb1j56lc8ys99cslaz9d10l09mmky5gxvgchmsbm5lqg3abm";
+      name = "kactivities-5.51.0.tar.xz";
    };
  };
  kactivities-stats = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kactivities-stats-5.50.0.tar.xz";
-      sha256 = "0h6dl0522sl7glzk4rz7qj5642il2nr2jwmknbwv3ljhxba9qdrs";
-      name = "kactivities-stats-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kactivities-stats-5.51.0.tar.xz";
+      sha256 = "057lxj8i5rdnh0lr8gnb4b3k0bg3dm2xam3fmrfllm81pvq8bq7l";
+      name = "kactivities-stats-5.51.0.tar.xz";
    };
  };
  kapidox = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kapidox-5.50.0.tar.xz";
-      sha256 = "11hp0qpndy9s8g6x95s8lk7abkp1yvqraa1cdvvsdhn71izmsmqz";
-      name = "kapidox-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kapidox-5.51.0.tar.xz";
+      sha256 = "0k7zlyr9gwq45vkzs3pvny5hgqkfd399fw7kwvi01lfkwha0d82n";
+      name = "kapidox-5.51.0.tar.xz";
    };
  };
  karchive = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/karchive-5.50.0.tar.xz";
-      sha256 = "1jh1cyvdg680swyq2nmcpk4cfqmy67v49jl76nm1b5399zcs282l";
-      name = "karchive-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/karchive-5.51.0.tar.xz";
+      sha256 = "1cr80dyxs0zq568x6ll30zr6dzym8pk27q1facw0nlyha4246rvn";
+      name = "karchive-5.51.0.tar.xz";
    };
  };
  kauth = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kauth-5.50.0.tar.xz";
-      sha256 = "15pk78a76897y4rym5ln1l5zm3n64rprl7k5bwkp4qzhwy7gzv7p";
-      name = "kauth-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kauth-5.51.0.tar.xz";
+      sha256 = "0pgrn9lkhgn9fifywlqqlrx4h295s8wnvjjn6a1saiib2pjaiyhm";
+      name = "kauth-5.51.0.tar.xz";
    };
  };
  kbookmarks = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kbookmarks-5.50.0.tar.xz";
-      sha256 = "1lvsarcwjkmx14bni9akxrrr11zsvr9fv47ahw97kj9p3wdb1sy9";
-      name = "kbookmarks-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kbookmarks-5.51.0.tar.xz";
+      sha256 = "1xsy1n4di28aj53gmvks9ajqh96xnbjcg8rlmkxsyrs9facfm24l";
+      name = "kbookmarks-5.51.0.tar.xz";
    };
  };
  kcmutils = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kcmutils-5.50.0.tar.xz";
-      sha256 = "1q9z8p20fn6k8yrhy0nq77yg4ra5vnpq6hq9mr7jkjqni9b0h3np";
-      name = "kcmutils-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kcmutils-5.51.0.tar.xz";
+      sha256 = "018kc5ynz0554bwmpzb0npn3hznrccv2vik2vablhcc73rkx8f68";
+      name = "kcmutils-5.51.0.tar.xz";
    };
  };
  kcodecs = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kcodecs-5.50.0.tar.xz";
-      sha256 = "13gh7vys0xxpfqzjbxwr65p6d6jgcg0wr9ir1xqbkc368kay4n7b";
-      name = "kcodecs-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kcodecs-5.51.0.tar.xz";
+      sha256 = "15hwqzc10k53dldhm6sq854l7pqmkrkgyrlxhbnygn91wi14zg2m";
+      name = "kcodecs-5.51.0.tar.xz";
    };
  };
  kcompletion = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kcompletion-5.50.0.tar.xz";
-      sha256 = "1n0frkk2phf6a0rcrsf011jb2f66sisjy9lmmiy1czy533y3iraz";
-      name = "kcompletion-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kcompletion-5.51.0.tar.xz";
+      sha256 = "1am6bsxy3hnc2d8ssmrx6njyw35vrsszmlrd4szimm4qajkj63zk";
+      name = "kcompletion-5.51.0.tar.xz";
    };
  };
  kconfig = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kconfig-5.50.0.tar.xz";
-      sha256 = "0jb4lq3k8lyjksgj728hgf0h81v6fxy1kyp17sv0cjrs6n3z8ry8";
-      name = "kconfig-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kconfig-5.51.0.tar.xz";
+      sha256 = "1h7iax57qxb08slf7dzs0dzmn9bhzb0hy3z0pwbc62bg6lvigcbq";
+      name = "kconfig-5.51.0.tar.xz";
    };
  };
  kconfigwidgets = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kconfigwidgets-5.50.0.tar.xz";
-      sha256 = "102al35g2c6v091zm086lvhbym0j0f81zpn6wsk5wr0xc569lagj";
-      name = "kconfigwidgets-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kconfigwidgets-5.51.0.tar.xz";
+      sha256 = "10zgqv5l4178kkzcl0jw36l7f34cv6yfamk459jj8rbnkjncrhxw";
+      name = "kconfigwidgets-5.51.0.tar.xz";
    };
  };
  kcoreaddons = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kcoreaddons-5.50.0.tar.xz";
-      sha256 = "1b7m4an322hk89n1svy3345106kphhn0ha7q21k5b3bwphszrx28";
-      name = "kcoreaddons-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kcoreaddons-5.51.0.tar.xz";
+      sha256 = "05xvf07z7f1qzz0h7kf987l4qhc75r26ckwv3a417h3aavgjpmqb";
+      name = "kcoreaddons-5.51.0.tar.xz";
    };
  };
  kcrash = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kcrash-5.50.0.tar.xz";
-      sha256 = "00n2ynhp1dbp75wkx9wm4mlyf5q3cbrk7k563mdihw88mzmmyvl4";
-      name = "kcrash-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kcrash-5.51.0.tar.xz";
+      sha256 = "1yfph8ban1pcljzhyg8rq6pkmwlwk4qg3nsdskfrkcjq96za2732";
+      name = "kcrash-5.51.0.tar.xz";
    };
  };
  kdbusaddons = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kdbusaddons-5.50.0.tar.xz";
-      sha256 = "0ijvg4j97j4fv063phg086s9db6nj5gfgic5gcqg99h9hznbqkym";
-      name = "kdbusaddons-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kdbusaddons-5.51.0.tar.xz";
+      sha256 = "1i54jdhci3w2929vlh43pqc1pzv0b17s5qx6fm2cwq2hbvpqd3kb";
+      name = "kdbusaddons-5.51.0.tar.xz";
    };
  };
  kdeclarative = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kdeclarative-5.50.0.tar.xz";
-      sha256 = "1fwfzvadqh4rfyklygs17mkikh5m0m4flka91wbhw6jg6w7bvc4c";
-      name = "kdeclarative-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kdeclarative-5.51.0.tar.xz";
+      sha256 = "145hasi0g46bbdqyhvw6yfr086c1j73cy46k9vjfw7vx79ksixvj";
+      name = "kdeclarative-5.51.0.tar.xz";
    };
  };
  kded = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kded-5.50.0.tar.xz";
-      sha256 = "1hfh2l40s2mz4qh2wirfa8lnixvvl6y0agh3l5ii0jw93wvyci01";
-      name = "kded-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kded-5.51.0.tar.xz";
+      sha256 = "1g7wc5jbmpqjknbq0ax6gx0rqkrkq020ypcjmah40vv045wq9abk";
+      name = "kded-5.51.0.tar.xz";
    };
  };
  kdelibs4support = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/portingAids/kdelibs4support-5.50.0.tar.xz";
-      sha256 = "12ilp1cnpfhd8f4zsnwwq428cip43yq3xj0px91ndfrgq8chg05l";
-      name = "kdelibs4support-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/portingAids/kdelibs4support-5.51.0.tar.xz";
+      sha256 = "05mq7zzjy21a2wsd836n5zbz8cm035c9yph4fq61f723rr4840iq";
+      name = "kdelibs4support-5.51.0.tar.xz";
    };
  };
  kdesignerplugin = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kdesignerplugin-5.50.0.tar.xz";
-      sha256 = "00dhhars7ab7zjsz992yswcns5zijzyy84fpym2hg1avxinm31x5";
-      name = "kdesignerplugin-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kdesignerplugin-5.51.0.tar.xz";
+      sha256 = "08n1q0ym6abj28k3ii3grr4qrj9gq8kq0vnygw2nv2q2yalvhvj0";
+      name = "kdesignerplugin-5.51.0.tar.xz";
    };
  };
  kdesu = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kdesu-5.50.0.tar.xz";
-      sha256 = "095vddhhlc8kyhrmygccvhzbhl6bkscnfrx3vf96anm68zyk4g3f";
-      name = "kdesu-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kdesu-5.51.0.tar.xz";
+      sha256 = "11j0hl6fv4az1dhmv8nnrqb8ahqwf75l5gyimsx2lzabqr5qh5p9";
+      name = "kdesu-5.51.0.tar.xz";
    };
  };
  kdewebkit = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kdewebkit-5.50.0.tar.xz";
-      sha256 = "0p5h58mcwyjkrbyq66360blx001j4997dk7z85a3hf64hhv7k10h";
-      name = "kdewebkit-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kdewebkit-5.51.0.tar.xz";
+      sha256 = "0zkg2qfhs60lmfx10kw30q6wvh01ldflcnzyngkmqrnlv28mwycg";
+      name = "kdewebkit-5.51.0.tar.xz";
    };
  };
  kdnssd = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kdnssd-5.50.0.tar.xz";
-      sha256 = "05d2y205mvdbgmmm0h4agbg4xf48x1xc2lgfvjnpgx8ilb5136pi";
-      name = "kdnssd-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kdnssd-5.51.0.tar.xz";
+      sha256 = "0bkxplw69a0lkwzqzqqpj46w6xgmkzac2mncxi9widla67c1ry0l";
+      name = "kdnssd-5.51.0.tar.xz";
    };
  };
  kdoctools = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kdoctools-5.50.0.tar.xz";
-      sha256 = "1zgjf7ib8qlgjkkhkgd3b679b672cgsbiqsshbp0f1hn25ig4dqy";
-      name = "kdoctools-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kdoctools-5.51.0.tar.xz";
+      sha256 = "127fmlq16zlm9ai4y09c9dyxnp5n9aj6bbpsg60yaarazfdgzhxw";
+      name = "kdoctools-5.51.0.tar.xz";
    };
  };
  kemoticons = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kemoticons-5.50.0.tar.xz";
-      sha256 = "194rhxwf7h3mmb990l0p6l6lrf181c0scikj4h2ngmnjklgvajsg";
-      name = "kemoticons-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kemoticons-5.51.0.tar.xz";
+      sha256 = "1f0af48mxzq9690vf820ysvv6kb6sxhimlhmqwwqgn4b31mg0zrq";
+      name = "kemoticons-5.51.0.tar.xz";
    };
  };
  kfilemetadata = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kfilemetadata-5.50.0.tar.xz";
-      sha256 = "063148xbnrgplzfgqdiwyzdj2rix97xln1x72kn3qprxzc5y257l";
-      name = "kfilemetadata-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kfilemetadata-5.51.0.tar.xz";
+      sha256 = "04yyvdm1agpmrjifcphfirsrjl326z20qfvibx4nzxaxzzqkbnyn";
+      name = "kfilemetadata-5.51.0.tar.xz";
    };
  };
  kglobalaccel = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kglobalaccel-5.50.0.tar.xz";
-      sha256 = "1dwp9h7lf1lagwhm2yd2wx130s1kacjinw95f4sznxdw943vp1b3";
-      name = "kglobalaccel-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kglobalaccel-5.51.0.tar.xz";
+      sha256 = "1bq5g4ff0zkgrvwvy4zk6b03zr6syqz00hsldb3ki3gxld246gkh";
+      name = "kglobalaccel-5.51.0.tar.xz";
    };
  };
  kguiaddons = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kguiaddons-5.50.0.tar.xz";
-      sha256 = "1apz11issmj8c8zw4l88grl38m6nhgwpxb1j9h9v6khjvkwxr987";
-      name = "kguiaddons-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kguiaddons-5.51.0.tar.xz";
+      sha256 = "1p8db1sxh9n1pb4f96wc0b1rzgfyxafawfrcxflcbxxmfb4fj29f";
+      name = "kguiaddons-5.51.0.tar.xz";
    };
  };
  kholidays = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kholidays-5.50.0.tar.xz";
-      sha256 = "0zjkmsjq4m7d2gmsa0m613ny92xcb3w9zbkbsvnh8ci7ghiscz1j";
-      name = "kholidays-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kholidays-5.51.0.tar.xz";
+      sha256 = "0nkmk7kb3jywc4p47k7hr5dzlzz47a20bjynvzx3rhn1rhfr0b5s";
+      name = "kholidays-5.51.0.tar.xz";
    };
  };
  khtml = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/portingAids/khtml-5.50.0.tar.xz";
-      sha256 = "1r1qz3pyqifrzinjz83rhb5fgw5si8xmac7jkmn8w82j2kb41bxa";
-      name = "khtml-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/portingAids/khtml-5.51.0.tar.xz";
+      sha256 = "1p61cn9wixs0zph79zlqsw9bqz0izysvag4b45jbxa8r9lfjr8cc";
+      name = "khtml-5.51.0.tar.xz";
    };
  };
  ki18n = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/ki18n-5.50.0.tar.xz";
-      sha256 = "1y6baizaynphbsfc2b93dh2nah23jh8a3rcbqn7whrdln0f31z19";
-      name = "ki18n-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/ki18n-5.51.0.tar.xz";
+      sha256 = "14yk52r9zabnhy8hs2xw9iq325f2q13cv41rbss24l99iggxq6bj";
+      name = "ki18n-5.51.0.tar.xz";
    };
  };
  kiconthemes = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kiconthemes-5.50.0.tar.xz";
-      sha256 = "0ip0py0lx3rhjg6wzhdxrbzckmq4n1pnfbzm996wqka6aa4dwzry";
-      name = "kiconthemes-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kiconthemes-5.51.0.tar.xz";
+      sha256 = "13swrvqsh9n9sp54kkmw3kj10z37ykf4185n3l3dsbfb7qm3m0c9";
+      name = "kiconthemes-5.51.0.tar.xz";
    };
  };
  kidletime = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kidletime-5.50.0.tar.xz";
-      sha256 = "1kqghslwvis72h1sw6r4vrwsz0mwqzf5shj6m5mxqk6jv9wbfni1";
-      name = "kidletime-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kidletime-5.51.0.tar.xz";
+      sha256 = "08galc5l9a479fm1xmraic60gf0y5r614r3075az22af4hvn37d0";
+      name = "kidletime-5.51.0.tar.xz";
    };
  };
  kimageformats = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kimageformats-5.50.0.tar.xz";
-      sha256 = "0kndxzkcjm9syb6k7zzw2jxdfm1gw6gasq78issypxwc1zci5nvb";
-      name = "kimageformats-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kimageformats-5.51.0.tar.xz";
+      sha256 = "1g1xsy7n9bw7qjv74wchfdb1kibl1h81bf2f6w1j9d4pfdvks19z";
+      name = "kimageformats-5.51.0.tar.xz";
    };
  };
  kinit = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kinit-5.50.0.tar.xz";
-      sha256 = "1lgalvd81skdncdhd0pwng0vvy54f5wi2wwpqcil22y3860jfb4i";
-      name = "kinit-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kinit-5.51.0.tar.xz";
+      sha256 = "1ds4yqxicq659rdq1nmlvm74r50ibbyypfgp93nh5hv6j8m90r0l";
+      name = "kinit-5.51.0.tar.xz";
    };
  };
  kio = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kio-5.50.0.tar.xz";
-      sha256 = "1bnjal43rpsbabwq756xswj1cbhbrqxgjpjccjgxqml7csa3yhh1";
-      name = "kio-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kio-5.51.0.tar.xz";
+      sha256 = "1iqwj9fcrlvfish8pqx1wfg9cy9pv9jhddghf0vi83z56ysxz0y0";
+      name = "kio-5.51.0.tar.xz";
    };
  };
  kirigami2 = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kirigami2-5.50.0.tar.xz";
-      sha256 = "0jc4xrs0il5b7s7hzi4ff7jn30r8kgg4fzqxrhwqix9rcxn3nrxl";
-      name = "kirigami2-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kirigami2-5.51.0.tar.xz";
+      sha256 = "1adsfvg7jffpvgcxiicwfxki6pgqp8fiiy0waklp5v6pw7ilfymx";
+      name = "kirigami2-5.51.0.tar.xz";
    };
  };
  kitemmodels = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kitemmodels-5.50.0.tar.xz";
-      sha256 = "1c4yfqibizrm0zw9kijgkx4pq0r9f12nrw2dnw90g8q7s0pg7q36";
-      name = "kitemmodels-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kitemmodels-5.51.0.tar.xz";
+      sha256 = "02dh3bbjzm5mps2q9ngacwqs1lj6f77pfsgj6205nl4y2q19x0vf";
+      name = "kitemmodels-5.51.0.tar.xz";
    };
  };
  kitemviews = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kitemviews-5.50.0.tar.xz";
-      sha256 = "0wghvj5f1xkm9rf6rg50m399z25m1rfvd67ixr0lqwnhag1r32n8";
-      name = "kitemviews-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kitemviews-5.51.0.tar.xz";
+      sha256 = "1jarijishc1a84bvz70bq5sjnhr4hfk15dvbhs7lzrf7pnf8cac4";
+      name = "kitemviews-5.51.0.tar.xz";
    };
  };
  kjobwidgets = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kjobwidgets-5.50.0.tar.xz";
-      sha256 = "0jc7hiid2b2bpj0xw2clrzkplnqi7x1lhh5za2c37dlynndy609q";
-      name = "kjobwidgets-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kjobwidgets-5.51.0.tar.xz";
+      sha256 = "07lbnwmlrf09pwx123ccwafjkcf0kindxyh33icwld7bac2jaxip";
+      name = "kjobwidgets-5.51.0.tar.xz";
    };
  };
  kjs = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/portingAids/kjs-5.50.0.tar.xz";
-      sha256 = "1jfdcg725mwcfigqhp2srshvj7vhzxb3yhpwij8c0gwmzm0h1lxv";
-      name = "kjs-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/portingAids/kjs-5.51.0.tar.xz";
+      sha256 = "01g02m3frb4cq690wqr0f45848ghhyf2xrz3cizg93m70i5c393w";
+      name = "kjs-5.51.0.tar.xz";
    };
  };
  kjsembed = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/portingAids/kjsembed-5.50.0.tar.xz";
-      sha256 = "1iacz8x0idlswg0lwiv2i1k2qklhkk6ih6nhkajq4dy6ajnpbn7a";
-      name = "kjsembed-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/portingAids/kjsembed-5.51.0.tar.xz";
+      sha256 = "0ml07jbjhzd67f486dawb7hi6dybcya81hmz2ma1dqrxlbyv4kml";
+      name = "kjsembed-5.51.0.tar.xz";
    };
  };
  kmediaplayer = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/portingAids/kmediaplayer-5.50.0.tar.xz";
-      sha256 = "0wz8ln45wkslh5c7dq8dijj19xr1xqxi5svv58a3hr5vbcyw3sjm";
-      name = "kmediaplayer-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/portingAids/kmediaplayer-5.51.0.tar.xz";
+      sha256 = "09xa925zzqi3ga1rja81f7zzk6yfr3pflagr3i8k5z60m3gzalh6";
+      name = "kmediaplayer-5.51.0.tar.xz";
    };
  };
  knewstuff = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/knewstuff-5.50.0.tar.xz";
-      sha256 = "1imh0hl056hpmrvdlmb68v0wclx3isr6l8sdqrzh3snmjm3jdwhd";
-      name = "knewstuff-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/knewstuff-5.51.0.tar.xz";
+      sha256 = "1kj8hs8wzagbd7g9ryc5jgwfwk97m4q64yk0nz297jviakfdkcwa";
+      name = "knewstuff-5.51.0.tar.xz";
    };
  };
  knotifications = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/knotifications-5.50.0.tar.xz";
-      sha256 = "0xj62kbrlq4ib7kibwrmsbf84nv6klbh3v7rb34alacvvaf5lljs";
-      name = "knotifications-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/knotifications-5.51.0.tar.xz";
+      sha256 = "0v37bi67r0i7bk3nk6hyvmz2jgf1hpfsy64qgg4c836l3bcfp8kz";
+      name = "knotifications-5.51.0.tar.xz";
    };
  };
  knotifyconfig = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/knotifyconfig-5.50.0.tar.xz";
-      sha256 = "01l4wn9khdd28rbi2qbpaqrgjp6achg6wbpaixwph2y2g9zgixdz";
-      name = "knotifyconfig-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/knotifyconfig-5.51.0.tar.xz";
+      sha256 = "0bnlgbpslsbzxfkwns5m8n5dydz61w50giyynl1yjjrkknz2qisn";
+      name = "knotifyconfig-5.51.0.tar.xz";
    };
  };
  kpackage = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kpackage-5.50.0.tar.xz";
-      sha256 = "0bx1hzjl5m9893s97mlhrrshagfkng36rxa0bwm7y8sbh4rnnj8p";
-      name = "kpackage-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kpackage-5.51.0.tar.xz";
+      sha256 = "0zlpw2i6q470xrn9h8i9c7siwnm5z355li4c0q431hjj1nrmh6b8";
+      name = "kpackage-5.51.0.tar.xz";
    };
  };
  kparts = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kparts-5.50.0.tar.xz";
-      sha256 = "1zwa0pyy0sa3j0yrdggl33gx3a48zvz68nl8r7b7ak445iwmx821";
-      name = "kparts-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kparts-5.51.0.tar.xz";
+      sha256 = "0m7qrigy6hsrxfkcc17ciqnk5inikpw0ksaj1s31hjkgfpnp40hh";
+      name = "kparts-5.51.0.tar.xz";
    };
  };
  kpeople = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kpeople-5.50.0.tar.xz";
-      sha256 = "0vc81g2i5wznfav4nh5c8cp31aridiwg9ksg0gaa2q41882w560b";
-      name = "kpeople-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kpeople-5.51.0.tar.xz";
+      sha256 = "0639adbg61drp58c6gz0xca0rhgqzk3ny3cz4p5w95r9c8mq4wvr";
+      name = "kpeople-5.51.0.tar.xz";
    };
  };
  kplotting = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kplotting-5.50.0.tar.xz";
-      sha256 = "18xw8q426sapim7532f0syb5nwf0vhx9h6xp52lyljj98l88vydw";
-      name = "kplotting-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kplotting-5.51.0.tar.xz";
+      sha256 = "0dngxcaw49i05kz5rk48k7pd85bklbiinv3444xvz8rg1xq1vvhh";
+      name = "kplotting-5.51.0.tar.xz";
    };
  };
  kpty = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kpty-5.50.0.tar.xz";
-      sha256 = "0slk8nwh94p8xp3q91wmda2v3ipmsvd4fpdsdfz4w2j0kh6nd6w5";
-      name = "kpty-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kpty-5.51.0.tar.xz";
+      sha256 = "1wqg42a72gqgr94p780i2vhzl3m16dc0kf9nsqyaaalw9k31qk0p";
+      name = "kpty-5.51.0.tar.xz";
    };
  };
  kross = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/portingAids/kross-5.50.0.tar.xz";
-      sha256 = "1g0i34z4rhrsnq41plavq880r3c17fki69vs3wjvzmybfn0klha2";
-      name = "kross-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/portingAids/kross-5.51.0.tar.xz";
+      sha256 = "139kgp052zqy51r8fyv0d62ci01ampg8na1hkkvmz69x0wqgqwv1";
+      name = "kross-5.51.0.tar.xz";
    };
  };
  krunner = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/krunner-5.50.0.tar.xz";
-      sha256 = "03igg111n7c6ys0xm075hlr8k0g599pwgha7wi02k8dbbc2q20g8";
-      name = "krunner-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/krunner-5.51.0.tar.xz";
+      sha256 = "0ij0ql1v0263891kcbpg8bjgf3v73lx298qdjysr01ib3jpy7r7f";
+      name = "krunner-5.51.0.tar.xz";
    };
  };
  kservice = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kservice-5.50.0.tar.xz";
-      sha256 = "0y0yk1gr7nd0svk4vkbyy1igy2klmwmsv8wwx1bvfkkg3yshz199";
-      name = "kservice-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kservice-5.51.0.tar.xz";
+      sha256 = "1q0m9cvdb67dv81v4vsxql3cg7g7j6ibrb49c1y0wy3bxg7ahn7g";
+      name = "kservice-5.51.0.tar.xz";
    };
  };
  ktexteditor = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/ktexteditor-5.50.0.tar.xz";
-      sha256 = "00h75yy17npwzhz572k1784h2gw5gynhl9gxbj0i9zbis1nfi1m2";
-      name = "ktexteditor-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/ktexteditor-5.51.0.tar.xz";
+      sha256 = "0gyb2sy759crw5xx9dhwk5wdrl3hxalab9c7v6aikfhn5c1jhd1w";
+      name = "ktexteditor-5.51.0.tar.xz";
    };
  };
  ktextwidgets = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/ktextwidgets-5.50.0.tar.xz";
-      sha256 = "18z108si2cr38np3wcd7hkjjqhs661j2xv0zf8837mm9di4bgjiz";
-      name = "ktextwidgets-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/ktextwidgets-5.51.0.tar.xz";
+      sha256 = "185pyxq97ggv2yxnhiw0kw8ykfvqgj2y4qbrhl2xji00fgmgbsb3";
+      name = "ktextwidgets-5.51.0.tar.xz";
    };
  };
  kunitconversion = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kunitconversion-5.50.0.tar.xz";
-      sha256 = "0f37ap98rzc575vjf1hhh51bbjvgn00g9mdnp9x3lmi5l6npvwj4";
-      name = "kunitconversion-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kunitconversion-5.51.0.tar.xz";
+      sha256 = "0acnpnc1k1n1z4nfrnnr1jq4a301qdvsap19s3if6cahn1g9f1c6";
+      name = "kunitconversion-5.51.0.tar.xz";
    };
  };
  kwallet = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kwallet-5.50.0.tar.xz";
-      sha256 = "14hlcly6x9ybczxg63nwsgv7kah1sx0haxlyllma4rwmh8a85ji5";
-      name = "kwallet-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kwallet-5.51.0.tar.xz";
+      sha256 = "1n5wzqk7cxssaxmw7ginl57gl0kg7ihzi57znzjzpffpfzl67faj";
+      name = "kwallet-5.51.0.tar.xz";
    };
  };
  kwayland = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kwayland-5.50.0.tar.xz";
-      sha256 = "021pqsv59svj6j4g6alcgrsdi5bybx8i1skpf1v5nf5fc6f17bqb";
-      name = "kwayland-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kwayland-5.51.0.tar.xz";
+      sha256 = "1d5nbwyx6n17cbif9nmj9lxnxj1bvcs20hri8q6750h5x5ad7xp2";
+      name = "kwayland-5.51.0.tar.xz";
    };
  };
  kwidgetsaddons = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kwidgetsaddons-5.50.0.tar.xz";
-      sha256 = "0yvd1b15vjk03jdwpyd97z1wn892amp3jkx3s7ff8nc8ax7fyc4m";
-      name = "kwidgetsaddons-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kwidgetsaddons-5.51.0.tar.xz";
+      sha256 = "04ryzr9p08jw4azbnvdmvr6ac157vp5l5lng2dvk8fmsvda9nx2p";
+      name = "kwidgetsaddons-5.51.0.tar.xz";
    };
  };
  kwindowsystem = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kwindowsystem-5.50.0.tar.xz";
-      sha256 = "0gmk7hp4z7ly6hm0z479hv5vqlmzfr4c9p6r572agzbpc8m682v9";
-      name = "kwindowsystem-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kwindowsystem-5.51.0.tar.xz";
+      sha256 = "1hl1dh21rxq58k799iyfcr6mwmc8pgbd8w3mcav61ls0217apxx1";
+      name = "kwindowsystem-5.51.0.tar.xz";
    };
  };
  kxmlgui = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kxmlgui-5.50.0.tar.xz";
-      sha256 = "1ga81jd0ad5jkb9wdh5hwzzq9axw6pcy4jz1vlc9s2xywyaq931l";
-      name = "kxmlgui-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kxmlgui-5.51.0.tar.xz";
+      sha256 = "0cj2rwbas6rs61hk5w8gklcdpxhsycdfhymg94cdkmdsmkrqvdnw";
+      name = "kxmlgui-5.51.0.tar.xz";
    };
  };
  kxmlrpcclient = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/kxmlrpcclient-5.50.0.tar.xz";
-      sha256 = "03xqxb08kbzs1m0sxpgq8lzf4809kkhl7yc17svq7y00xgq3h36r";
-      name = "kxmlrpcclient-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/kxmlrpcclient-5.51.0.tar.xz";
+      sha256 = "0fsfplx5dk0p327r0cncxv0b0mdqfbrj4778a5fbyh3zr17rgd47";
+      name = "kxmlrpcclient-5.51.0.tar.xz";
    };
  };
  modemmanager-qt = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/modemmanager-qt-5.50.0.tar.xz";
-      sha256 = "1w7im3ihcpqvjiw7rj7iakxpyhzlaams0r900kh0mv4zfdyl9szs";
-      name = "modemmanager-qt-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/modemmanager-qt-5.51.0.tar.xz";
+      sha256 = "0pvypijbwb95nzx58mhkcz06br6x7z5gagkxgwi5qbgkjg57nf0a";
+      name = "modemmanager-qt-5.51.0.tar.xz";
    };
  };
  networkmanager-qt = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/networkmanager-qt-5.50.0.tar.xz";
-      sha256 = "168bzsvsh3i1w3840nickg7rv0hncaiiv6sc1sycg4n6v7773dzl";
-      name = "networkmanager-qt-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/networkmanager-qt-5.51.0.tar.xz";
+      sha256 = "15isj6gma8vb7kpaniq2qacfsl4qzdancxbbndbx4vz452wn8vdx";
+      name = "networkmanager-qt-5.51.0.tar.xz";
    };
  };
  oxygen-icons5 = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/oxygen-icons5-5.50.0.tar.xz";
-      sha256 = "1ajx9y4wqzi55dmz360j7ha987m3wzs2zbnrm49lipgd55c8n3nc";
-      name = "oxygen-icons5-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/oxygen-icons5-5.51.0.tar.xz";
+      sha256 = "0c6jbd5m3k98bsmapaaaqsrbk3d4ij0k41gb1j2dpc8hfni1i7gh";
+      name = "oxygen-icons5-5.51.0.tar.xz";
    };
  };
  plasma-framework = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/plasma-framework-5.50.0.tar.xz";
-      sha256 = "01p0friqdhzjkssd655rdsfxp2hdqaf34ypqzx7xwnw3wj1971r8";
-      name = "plasma-framework-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/plasma-framework-5.51.0.tar.xz";
+      sha256 = "1ps40ch729fsn4g3mnjk0ka1jldj8lzg2mh3lh7afm0vkcxm9b4n";
+      name = "plasma-framework-5.51.0.tar.xz";
    };
  };
  prison = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/prison-5.50.0.tar.xz";
-      sha256 = "1v62dq44li0wwrgiiwad2hjj2vzcypa3i9qp0gwc8kkzg162b62d";
-      name = "prison-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/prison-5.51.0.tar.xz";
+      sha256 = "1km2zkj26ymc7lr32x1a001070jj12qnckb2spv67p5cakxrlhan";
+      name = "prison-5.51.0.tar.xz";
    };
  };
  purpose = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/purpose-5.50.0.tar.xz";
-      sha256 = "11m5391mjf4r89frvvdq9jlkylp67h87x0g3mx00yfc004bsyi6f";
-      name = "purpose-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/purpose-5.51.0.tar.xz";
+      sha256 = "0pmmwjxaplccc7shyb4199adg0gmm7w1jj4z21mds1mj37p4n0l8";
+      name = "purpose-5.51.0.tar.xz";
    };
  };
  qqc2-desktop-style = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/qqc2-desktop-style-5.50.0.tar.xz";
-      sha256 = "0ml88m6hb1llzl7kaykkny7v717grvzh8jnlwdyla2lv4rvvz7d8";
-      name = "qqc2-desktop-style-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/qqc2-desktop-style-5.51.0.tar.xz";
+      sha256 = "1ahga7q6z1d9s2xm9fa4xvdikvywzpdk9098lms7cgzk3jrh0dxi";
+      name = "qqc2-desktop-style-5.51.0.tar.xz";
    };
  };
  solid = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/solid-5.50.0.tar.xz";
-      sha256 = "1y8sclp8lqf4hkqvbm1mmklrjvkxpvz3bb8qqbi5xhd5p9vf6z0h";
-      name = "solid-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/solid-5.51.0.tar.xz";
+      sha256 = "0rgsjz44jxqiy1nqxa03mymz7bjzcxf5xfyf0cnn0gkz4w8wc1bd";
+      name = "solid-5.51.0.tar.xz";
    };
  };
  sonnet = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/sonnet-5.50.0.tar.xz";
-      sha256 = "13ddp5l9vnyqg05xadc4d1j0xfl8ain4qprq3iw82ygrchyrzm0d";
-      name = "sonnet-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/sonnet-5.51.0.tar.xz";
+      sha256 = "05srs168psqpsdlgx2b4f4ik613yl2cgn4zz495c0wd36500zza4";
+      name = "sonnet-5.51.0.tar.xz";
    };
  };
  syndication = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/syndication-5.50.0.tar.xz";
-      sha256 = "1i73blq2fdzvzfg1p6715fv5m40yd6vcvnbg1pfmbr3696qy4mb3";
-      name = "syndication-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/syndication-5.51.0.tar.xz";
+      sha256 = "0ngygkwmc8a9132a02x29k998i5l5a6lnk8j6lf0phpp6pvwi9yf";
+      name = "syndication-5.51.0.tar.xz";
    };
  };
  syntax-highlighting = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/syntax-highlighting-5.50.0.tar.xz";
-      sha256 = "10iw8fhqgvsn4jgf81d9xy8aac07acn45rysnvj9wpm3cmxqxmd4";
-      name = "syntax-highlighting-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/syntax-highlighting-5.51.0.tar.xz";
+      sha256 = "0lhdm55x23289nmjk12g5f6l4glmw2jmi9cj7792scxqfrwnv8s7";
+      name = "syntax-highlighting-5.51.0.tar.xz";
    };
  };
  threadweaver = {
-    version = "5.50.0";
+    version = "5.51.0";
    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.50/threadweaver-5.50.0.tar.xz";
-      sha256 = "11j82nq5pr7rk94bnfzanpj3b41dqjl9cgk2b3h326y7bphcrkyf";
-      name = "threadweaver-5.50.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.51/threadweaver-5.51.0.tar.xz";
+      sha256 = "17daaaj6p8bsmcllxqs2a1ywidcb6rg1s1ichn0isk69gzyv5xlm";
+      name = "threadweaver-5.51.0.tar.xz";
    };
  };
 }
--- a/pkgs/development/libraries/libtensorflow/default.nix
+++ b/pkgs/development/libraries/libtensorflow/default.nix
@ -57,6 +57,17 @@ in stdenv.mkDerivation rec {
    ${patchLibs}
    chmod -w $out/lib/libtensorflow.so
    chmod -w $out/lib/libtensorflow_framework.so
+
+    # Write pkgconfig file.
+    mkdir $out/lib/pkgconfig
+    cat > $out/lib/pkgconfig/tensorflow.pc << EOF
+    Name: TensorFlow
+    Version: ${version}
+    Description: Library for computation using data flow graphs for scalable machine learning
+    Requires:
+    Libs: -L$out/lib -ltensorflow
+    Cflags: -I$out/include/tensorflow
+    EOF
  '';

  meta = {
--- a/pkgs/development/libraries/libvirt-glib/default.nix
+++ b/pkgs/development/libraries/libvirt-glib/default.nix
@ -6,13 +6,13 @@
 let
  inherit (pythonPackages) python pygobject2;
 in stdenv.mkDerivation rec {
-  name = "libvirt-glib-1.0.0";
+  name = "libvirt-glib-2.0.0";

  outputs = [ "out" "dev" ];

  src = fetchurl {
    url = "https://libvirt.org/sources/glib/${name}.tar.gz";
-    sha256 = "0iwa5sdbii52pjpdm5j37f67sdmf0kpcky4liwhy1nf43k85i4fa";
+    sha256 = "0six9ckmvlwwyavyjkgc262qkpvfqgi8rjij7cyk00bmqq8c9s4l";
  };

  nativeBuildInputs = [ pkgconfig vala ];
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@ -1,24 +1,24 @@
-{ stdenv, fetchgit, openssl, doxygen, boost, sqlite, cryptopp, pkgconfig, python, pythonPackages }:
+{ stdenv, fetchFromGitHub, openssl, doxygen, boost, sqlite, pkgconfig, python, pythonPackages }:
 let
-  version = "4c32e7";
+  version = "0.6.3";
 in
 stdenv.mkDerivation {
-  name = "ndn-cxx-0.1-${version}";
-  src = fetchgit {
-    url = "https://github.com/named-data/ndn-cxx.git";
-    rev = "4c32e748863d5165cc0e3d6b54a8383f4836cdf1";
-    sha256 = "18szs3j3ig8wlcqngran0daxaj7j2qsmch0212ids6fymj1hgax4";
+  name = "ndn-cxx-${version}";
+  src = fetchFromGitHub {
+    owner = "named-data";
+    repo = "ndn-cxx";
+    rev = "a3bf4319ed483a4a6fe2c96b79ec4491d7217f00";
+    sha256 = "076jhrjigisqz5n8dgxwd5fhimg69zhm834m7w9yvf9afgzrr50h";
  };
  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ openssl doxygen boost sqlite cryptopp python pythonPackages.sphinx];
+  buildInputs = [ openssl doxygen boost sqlite python pythonPackages.sphinx];
  preConfigure = ''
    patchShebangs waf
    ./waf configure \
-      --with-cryptopp=${cryptopp} \
+      --prefix=$out \
+      --with-openssl=${openssl.dev} \
      --boost-includes=${boost.dev}/include \
-      --boost-libs=${boost.out}/lib \
-      --with-examples \
-      --prefix=$out
+      --boost-libs=${boost.out}/lib
  '';
  buildPhase = ''
    ./waf
@ -45,6 +45,5 @@ stdenv.mkDerivation {
    license = licenses.lgpl3;
    platforms = stdenv.lib.platforms.unix;
    maintainers = [ maintainers.sjmackenzie ];
-    broken = true; # 2018-04-11
  };
 }
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@ -10,12 +10,12 @@ assert alsaSupport -> alsaLib != null;
 assert pulseSupport -> libpulseaudio != null;

 stdenv.mkDerivation rec {
-  version = "1.18.2";
+  version = "1.19.0";
  name = "openal-soft-${version}";

  src = fetchurl {
    url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2";
-    sha256 = "10kydm8701a2kppiss9sdidn1820cmzhqgx1b2bsa5dsgzic32lz";
+    sha256 = "1mhf5bsb58s1xk6hvxl7ly7rd4rpl9z8h07xl1q94brywykg7bgi";
  };

  nativeBuildInputs = [ cmake ];
--- a/pkgs/development/libraries/opencollada/default.nix
+++ b/pkgs/development/libraries/opencollada/default.nix
@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
  name = "opencollada-${version}";

-  version = "1.6.63";
+  version = "1.6.65";

  src = fetchFromGitHub {
    owner = "KhronosGroup";
    repo = "OpenCOLLADA";
    rev = "v${version}";
-    sha256 = "1x8hz5nkz4lxsf17jv8sdl92dmbbpkqck8jkkc6g32d8gbs3gha1";
+    sha256 = "1vxb0b1dqcfwyhb36gjbn0fjdgn3hb03l68jbs0jzx6i2lh8bsh9";
  };

  nativeBuildInputs = [ pkgconfig ];
--- a/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwebkit.nix
@ -1,5 +1,5 @@
 { qtModule, stdenv, lib, fetchurl
-, qtbase, qtdeclarative, qtlocation, qtsensors, qtwebchannel
+, qtbase, qtdeclarative, qtlocation, qtmultimedia, qtsensors, qtwebchannel
 , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
 , sqlite, systemd, glib, gst_all_1, cmake
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
@ -23,7 +23,9 @@ let
 in
 qtModule {
  name = "qtwebkit";
-  qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ] ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ qtwebchannel ];
+  qtInputs = [ qtbase qtdeclarative qtlocation qtsensors ]
+    ++ optional (stdenv.isDarwin && lib.versionAtLeast qtbase.version "5.9.0") qtmultimedia
+    ++ optional (lib.versionAtLeast qtbase.version "5.11.0") qtwebchannel;
  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
    ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ])
    ++ optionals (lib.versionAtLeast qtbase.version "5.11.0") [ hyphen ];
--- a/pkgs/development/libraries/science/math/suitesparse/4.4.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/4.4.nix
@ -0,0 +1,100 @@
+{ stdenv, fetchurl, gfortran, openblas
+, enableCuda  ? false, cudatoolkit
+}:
+
+let
+  version = "4.4.4";
+  name = "suitesparse-${version}";
+
+  int_t = if openblas.blas64 then "int64_t" else "int32_t";
+  SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
+in
+stdenv.mkDerivation {
+  inherit name;
+
+  src = fetchurl {
+    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz";
+    sha256 = "1zdn1y0ij6amj7smmcslkqgbqv9yy5cwmbyzqc9v6drzdzllgbpj";
+  };
+
+  preConfigure = ''
+    mkdir -p $out/lib
+    mkdir -p $out/include
+
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's/METIS .*$/METIS =/' \
+        -e 's/METIS_PATH .*$/METIS_PATH =/' \
+        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
+        -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
+  ''
+  + stdenv.lib.optionalString stdenv.isDarwin ''
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's/^[[:space:]]*\(LIB = -lm\) -lrt/\1/'
+  ''
+  + stdenv.lib.optionalString enableCuda ''
+    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
+        -e 's|^[[:space:]]*\(CUDA_ROOT     =\)|CUDA_ROOT = ${cudatoolkit}|' \
+        -e 's|^[[:space:]]*\(GPU_BLAS_PATH =\)|GPU_BLAS_PATH = $(CUDA_ROOT)|' \
+        -e 's|^[[:space:]]*\(GPU_CONFIG    =\)|GPU_CONFIG = -I$(CUDA_ROOT)/include -DGPU_BLAS -DCHOLMOD_OMP_NUM_THREADS=$(NIX_BUILD_CORES) |' \
+        -e 's|^[[:space:]]*\(CUDA_PATH     =\)|CUDA_PATH = $(CUDA_ROOT)|' \
+        -e 's|^[[:space:]]*\(CUDART_LIB    =\)|CUDART_LIB = $(CUDA_ROOT)/lib64/libcudart.so|' \
+        -e 's|^[[:space:]]*\(CUBLAS_LIB    =\)|CUBLAS_LIB = $(CUDA_ROOT)/lib64/libcublas.so|' \
+        -e 's|^[[:space:]]*\(CUDA_INC_PATH =\)|CUDA_INC_PATH = $(CUDA_ROOT)/include/|' \
+        -e 's|^[[:space:]]*\(NV20          =\)|NV20 = -arch=sm_20 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NV30          =\)|NV30 = -arch=sm_30 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NV35          =\)|NV35 = -arch=sm_35 -Xcompiler -fPIC|' \
+        -e 's|^[[:space:]]*\(NVCC          =\) echo|NVCC = $(CUDA_ROOT)/bin/nvcc|' \
+        -e 's|^[[:space:]]*\(NVCCFLAGS     =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
+  '';
+
+  makeFlags = [
+    "PREFIX=\"$(out)\""
+    "INSTALL_LIB=$(out)/lib"
+    "INSTALL_INCLUDE=$(out)/include"
+    "BLAS=-lopenblas"
+    "LAPACK="
+  ];
+
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";
+
+  postInstall = ''
+    # Build and install shared library
+    (
+        cd "$(mktemp -d)"
+        for i in "$out"/lib/lib*.a; do
+          ar -x $i
+        done
+        ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"}
+    )
+    for i in umfpack cholmod amd camd colamd spqr; do
+      ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT}
+    done
+
+    # Install documentation
+    outdoc=$out/share/doc/${name}
+    mkdir -p $outdoc
+    cp -r AMD/Doc $outdoc/amd
+    cp -r BTF/Doc $outdoc/bft
+    cp -r CAMD/Doc $outdoc/camd
+    cp -r CCOLAMD/Doc $outdoc/ccolamd
+    cp -r CHOLMOD/Doc $outdoc/cholmod
+    cp -r COLAMD/Doc $outdoc/colamd
+    cp -r CXSparse/Doc $outdoc/cxsparse
+    cp -r KLU/Doc $outdoc/klu
+    cp -r LDL/Doc $outdoc/ldl
+    cp -r RBio/Doc $outdoc/rbio
+    cp -r SPQR/Doc $outdoc/spqr
+    cp -r UMFPACK/Doc $outdoc/umfpack
+  '';
+
+  nativeBuildInputs = [ gfortran ];
+  buildInputs = [ openblas ];
+
+  meta = with stdenv.lib; {
+    homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
+    description = "A suite of sparse matrix algorithms";
+    license = with licenses; [ bsd2 gpl2Plus lgpl21Plus ];
+    maintainers = with maintainers; [ ttuegel ];
+    platforms = with platforms; unix;
+  };
+}
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@ -1,31 +1,32 @@
-{ stdenv, fetchurl, gfortran, openblas
+{ stdenv, fetchurl, gfortran, openblas, cmake
 , enableCuda  ? false, cudatoolkit
 }:

 let
-  version = "4.4.4";
+  version = "5.3.0";
  name = "suitesparse-${version}";

-  int_t = if openblas.blas64 then "int64_t" else "int32_t";
  SHLIB_EXT = stdenv.hostPlatform.extensions.sharedLibrary;
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  inherit name;

  src = fetchurl {
    url = "http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-${version}.tar.gz";
-    sha256 = "1zdn1y0ij6amj7smmcslkqgbqv9yy5cwmbyzqc9v6drzdzllgbpj";
+    sha256 = "0gcn1xj3z87wpp26gxn11k8073bxv6jswfd8jmddlm64v09rgrlh";
  };

+  dontUseCmakeConfigure = true;
+
  preConfigure = ''
    mkdir -p $out/lib
    mkdir -p $out/include
+    mkdir -p $out/share/doc/${name}

    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
        -e 's/METIS .*$/METIS =/' \
        -e 's/METIS_PATH .*$/METIS_PATH =/' \
-        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION -DLONGBLAS=${int_t}/' \
-        -e '/UMFPACK_CONFIG/ s/$/-DLONGBLAS=${int_t}/'
+        -e '/CHOLMOD_CONFIG/ s/$/-DNPARTITION/'
  ''
  + stdenv.lib.optionalString stdenv.isDarwin ''
    sed -i "SuiteSparse_config/SuiteSparse_config.mk" \
@ -47,48 +48,56 @@ stdenv.mkDerivation {
        -e 's|^[[:space:]]*\(NVCCFLAGS     =\)|NVCCFLAGS = $(NV20) -O3 -gencode=arch=compute_20,code=sm_20 -gencode=arch=compute_30,code=sm_30 -gencode=arch=compute_35,code=sm_35 -gencode=arch=compute_60,code=sm_60|'
  '';

-  makeFlags = [
-    "PREFIX=\"$(out)\""
-    "INSTALL_LIB=$(out)/lib"
-    "INSTALL_INCLUDE=$(out)/include"
-    "BLAS=-lopenblas"
-    "LAPACK="
-  ];
-
  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin " -DNTIMER";

-  postInstall = ''
-    # Build and install shared library
+  buildPhase = ''
+    runHook preBuild
+
+    # Build individual shared libraries
+    make library        \
+        BLAS=-lopenblas \
+        LAPACK=""       \
+        ${stdenv.lib.optionalString openblas.blas64 "CFLAGS=-DBLAS64"}
+
+    # Build libsuitesparse.so which bundles all the individual libraries.
+    # Bundling is done by building the static libraries, extracting objects from
+    # them and combining the objects into one shared library.
+    mkdir -p static
+    make static AR_TARGET=$(pwd)/static/'$(LIBRARY).a'
    (
-        cd "$(mktemp -d)"
-        for i in "$out"/lib/lib*.a; do
+        cd static
+        for i in lib*.a; do
          ar -x $i
        done
-        ${if enableCuda then cudatoolkit else stdenv.cc.outPath}/bin/${if enableCuda then "nvcc" else "cc"} *.o ${if stdenv.isDarwin then "-dynamiclib" else "--shared"} -o "$out/lib/libsuitesparse${SHLIB_EXT}" -lopenblas ${stdenv.lib.optionalString enableCuda "-lcublas"}
    )
-    for i in umfpack cholmod amd camd colamd spqr; do
-      ln -s libsuitesparse${SHLIB_EXT} "$out"/lib/lib$i${SHLIB_EXT}
-    done
+    ${if enableCuda then "${cudatoolkit}/bin/nvcc" else "${stdenv.cc.outPath}/bin/cc"} \
+        static/*.o                                                                     \
+        ${if stdenv.isDarwin then "-dynamiclib" else "--shared"}                       \
+        -o "lib/libsuitesparse${SHLIB_EXT}"                                            \
+        -lopenblas                                                                     \
+        ${stdenv.lib.optionalString enableCuda "-lcublas"}

-    # Install documentation
-    outdoc=$out/share/doc/${name}
-    mkdir -p $outdoc
-    cp -r AMD/Doc $outdoc/amd
-    cp -r BTF/Doc $outdoc/bft
-    cp -r CAMD/Doc $outdoc/camd
-    cp -r CCOLAMD/Doc $outdoc/ccolamd
-    cp -r CHOLMOD/Doc $outdoc/cholmod
-    cp -r COLAMD/Doc $outdoc/colamd
-    cp -r CXSparse/Doc $outdoc/cxsparse
-    cp -r KLU/Doc $outdoc/klu
-    cp -r LDL/Doc $outdoc/ldl
-    cp -r RBio/Doc $outdoc/rbio
-    cp -r SPQR/Doc $outdoc/spqr
-    cp -r UMFPACK/Doc $outdoc/umfpack
+    runHook postBuild
  '';

-  nativeBuildInputs = [ gfortran ];
-  buildInputs = [ openblas ];
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    cp -r lib $out/
+    cp -r include $out/
+    cp -r share $out/
+
+    # Fix rpaths
+    cd $out
+    find -name \*.so\* -type f -exec \
+      patchelf --set-rpath "$out/lib:${stdenv.lib.makeLibraryPath buildInputs}" {} \;
+
+    runHook postInstall
+  '';
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ openblas gfortran.cc.lib ] ++ stdenv.lib.optionals enableCuda [cudatoolkit];

  meta = with stdenv.lib; {
    homepage = http://faculty.cse.tamu.edu/davis/suitesparse.html;
--- a/pkgs/development/ocaml-modules/ppxlib/default.nix
+++ b/pkgs/development/ocaml-modules/ppxlib/default.nix
@ -3,14 +3,14 @@
 }:

 stdenv.mkDerivation rec {
-  version = "0.3.0";
+  version = "0.3.1";
  name = "ocaml${ocaml.version}-ppxlib-${version}";

  src = fetchFromGitHub {
    owner = "ocaml-ppx";
    repo = "ppxlib";
    rev = version;
-    sha256 = "0csp49jh7zgjnqh46mxbf322whlbmgy7v1a12nvxh97qg6i5fvsy";
+    sha256 = "0qpjl84x8abq9zivifb0k8ld7fa1lrhkbajmmccvfv06ja3as1v4";
  };

  buildInputs = [ ocaml findlib dune ];
--- a/pkgs/development/python-modules/cymem/default.nix
+++ b/pkgs/development/python-modules/cymem/default.nix
@ -6,20 +6,25 @@
 }:
 buildPythonPackage rec {
  pname = "cymem";
-  version = "1.31.2";
+  version = "2.0.2";
  name = pname + "-" + version;

  src = fetchFromGitHub {
    owner = "explosion";
    repo = "cymem";
-    rev = "1.31.2";
-    sha256 = "0miznr4kbdzw8yik3m96jmrlmln4qv7z3i3qdp7wjqr51zpqfm1k";
+    rev = "v${version}";
+    sha256 = "109i67vwgql9za8mfvgbrd6rgraz4djkvpzb4gqvzl13214s6ava";
  };

  propagatedBuildInputs = [
   cython
  ];

+  prePatch = ''
+    substituteInPlace setup.py \
+      --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0"
+  '';
+
  checkPhase = ''
    cd cymem/tests
    ${python.interpreter} -m unittest discover -p "*test*"
--- a/pkgs/development/python-modules/preshed/default.nix
+++ b/pkgs/development/python-modules/preshed/default.nix
@ -8,21 +8,27 @@
 }:
 buildPythonPackage rec {
  pname = "preshed";
-  version = "1.0.1";
+  version = "2.0.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "7b99ace606143a922163a7ff7ad4969b296288f5b20b9c9bda328caec3b92f71";
+    sha256 = "1rd943zp4gyspajqm5qxzndxziyh51grx0zcw23w8r9r65s1rq6s";
  };

  propagatedBuildInputs = [
   cython
   cymem
  ];
+
  buildInputs = [
    pytest
  ];

+  prePatch = ''
+    substituteInPlace setup.py \
+      --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0"
+  '';
+
  checkPhase = ''
    ${python.interpreter} setup.py test
  '';
--- a/pkgs/development/python-modules/spacy/default.nix
+++ b/pkgs/development/python-modules/spacy/default.nix
@ -23,22 +23,19 @@

 buildPythonPackage rec {
  pname = "spacy";
-  version = "2.0.12";
+  version = "2.0.16";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "b220ebee412c19613c26b2c1870b60473834bd686cec49553ce5f184164d3359";
+    sha256 = "1ghgbv819ff4777904p1kzayq1dj34i7853anvg859sak59r7pj1";
  };

  prePatch = ''
    substituteInPlace setup.py \
-      --replace "html5lib==" "html5lib>=" \
      --replace "regex==" "regex>=" \
-      --replace "ftfy==" "ftfy>=" \
-      --replace "msgpack-python==" "msgpack-python>=" \
-      --replace "msgpack-numpy==" "msgpack-numpy>=" \
-      --replace "thinc>=6.10.3,<6.11.0" "thinc>=6.10.3" \
-      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6"
+      --replace "plac<1.0.0,>=0.9.6" "plac>=0.9.6" \
+      --replace "thinc>=6.12.0,<6.13.0" "thinc>=6.12.0" \
+      --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0"
  '';

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/thinc/default.nix
+++ b/pkgs/development/python-modules/thinc/default.nix
@ -26,21 +26,13 @@

 buildPythonPackage rec {
  pname = "thinc";
-  version = "6.11.2";
+  version = "6.12.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "028a014192e1914c151222794781d14e1c9fddf47a859aa36077f07871d0c30a";
+    sha256 = "0lfdf08v7rrj9b29z2vf8isaqa0zh16acw9im8chkqsh8bay4ykm";
  };

-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "msgpack-python==" "msgpack-python>=" \
-      --replace "msgpack-numpy==" "msgpack-numpy>=" \
-      --replace "plac>=0.9,<1.0" "plac>=0.9" \
-      --replace "hypothesis>=2,<3" "hypothesis>=2"
-  '';
-
  buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
    Accelerate CoreFoundation CoreGraphics CoreVideo
  ]);
@ -71,13 +63,10 @@ buildPythonPackage rec {
  ];

  prePatch = ''
-    substituteInPlace setup.py --replace \
-      "'pathlib>=1.0.0,<2.0.0'," \
-      "\"pathlib>=1.0.0,<2.0.0; python_version<'3.4'\","
-
-    substituteInPlace setup.py --replace \
-      "'cytoolz>=0.8,<0.9'," \
-      "'cytoolz>=0.8',"
+    substituteInPlace setup.py \
+      --replace "pathlib==1.0.1" "pathlib>=1.0.0,<2.0.0" \
+      --replace "plac>=0.9.6,<1.0.0" "plac>=0.9.6" \
+      --replace "wheel>=0.32.0,<0.33.0" "wheel>=0.31.0"
  '';

  # Cannot find cython modules.
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@ -1,7 +1,7 @@
-{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2 }:
+{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }:

 let
-  version = "1.8.2";
+  version = "3.0.5";
  name = "electron-${version}";

  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
@ -20,19 +20,19 @@ let
    src = {
      i686-linux = fetchurl {
        url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
-        sha256 = "12q5h6gh9zzhndg6yfka821rblq3l80d2qzqrq4nbq6rlsshjp9d";
+        sha256 = "1jrvvjx9q1aklp09fk9g5yg0qnq2gx8837d45aaig2ycy0srhdif";
      };
      x86_64-linux = fetchurl {
        url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-        sha256 = "07ggq9wgfz3z5z0lwzzgs6im0qs83pz0pcfwr0r42zgmwg7j78b8";
+        sha256 = "1bgi980zwarmxmp98nwdlfy9qnid4y65aadl66n6wwvb6hs4zjmz";
      };
      armv7l-linux = fetchurl {
        url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
-        sha256 = "1b0p5x9zigyd6d8gz2hxc4scllrpnbx1dzzwlsvw6ilqbj1ypc7i";
+        sha256 = "1ayfcy7jm7mymmbdq08id9wpjj6cja2cyix1sw2r3m8gpn4l6ih2";
      };
      aarch64-linux = fetchurl {
        url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
-        sha256 = "0k4np2d4y15x1qfay8y9m8v9y223vdpbq5fdxa3ywbbyf8j361zd";
+        sha256 = "18cqg9zb98c0rfrdg7ri26dvhjwrwzj41jn8dfra9131xc84nl3i";
      };
    }.${stdenv.hostPlatform.system} or throwSystem;

@ -47,7 +47,7 @@ let

      patchelf \
        --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${atomEnv.libPath}:${gtk2}/lib:$out/lib/electron" \
+        --set-rpath "${atomEnv.libPath}:${gtk2}/lib:${at-spi2-atk}/lib:$out/lib/electron" \
        $out/lib/electron/electron

      wrapProgram $out/lib/electron/electron \
@ -60,7 +60,7 @@ let

    src = fetchurl {
      url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
-      sha256 = "0pq587vr1i87jdwcpbf6n136i9dp6i39dp5s95kihnm9qglxr42b";
+      sha256 = "18sjgb93hs73bx8wa0i8r64wdh927jdwpcsxd6pfq68lfw38g2ks";
    };

    buildInputs = [ unzip ];
--- a/pkgs/development/tools/misc/elfutils/default.nix
+++ b/pkgs/development/tools/misc/elfutils/default.nix
@ -3,11 +3,11 @@
 # TODO: Look at the hardcoded paths to kernel, modules etc.
 stdenv.mkDerivation rec {
  name = "elfutils-${version}";
-  version = "0.173";
+  version = "0.174";

  src = fetchurl {
    url = "https://sourceware.org/elfutils/ftp/${version}/${name}.tar.bz2";
-    sha256 = "1zq0l12k64hrbjmdjc4llrad96c25i427hpma1id9nk87w9qqvdp";
+    sha256 = "12nhr8zrw4sjzrvpf38vl55bq5nm05qkd7nq76as443f0xq7xwnd";
  };

  patches = [ ./debug-info-from-env.patch ];
--- a/pkgs/development/tools/ocaml/ocamlbuild/default.nix
+++ b/pkgs/development/tools/ocaml/ocamlbuild/default.nix
@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, ocaml, findlib }:
 let
-  version = "0.12.0";
+  version = "0.13.0";
 in
 stdenv.mkDerivation {
  name = "ocamlbuild-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
    owner = "ocaml";
    repo = "ocamlbuild";
    rev = version;
-    sha256 = "1shyim50ms0816fphc4mk0kldcx3pnba2i6m10q0cbm18m9d7chq";
+    sha256 = "13r9q8c209gkgcmbjhj9z4r5bmi90rxahdsiqm5jx8sr2pia5xbh";
  };

  createFindlibDestdir = true;
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@ -1,45 +1,74 @@
-{ stdenv, fetchFromGitHub, qmake4Hook, qt4, protobuf, boost155, tinyxml2, libgcrypt, sqlite, gsasl, curl, SDL, SDL_mixer, libircclient }:
+{ stdenv, fetchFromGitHub, runCommand, fetchpatch, patchutils, qmake, qtbase
+, SDL, SDL_mixer, boost, curl, gsasl, libgcrypt, libircclient, protobuf, sqlite
+, tinyxml2, target ? "client" }:

-let boost = boost155;
-in stdenv.mkDerivation rec {
-  name            = "${pname}-${version}";
-  pname           = "pokerth";
-  version         = "1.1.1";
+with stdenv.lib;

-  src = fetchFromGitHub {
-    owner  = pname;
-    repo   = pname;
-    rev    = "7f3c8a860848c16c8c2f78e3929a65a54ef4c04c";
-    sha256 = "1md3sl7pdpn3n42k75pxqbkkl19cz4699g1vdi04qpp0jxx09a2k";
+let
+  hiDPI = fetchpatch {
+    url = https://github.com/pokerth/pokerth/commit/ad8c9cabfb85d8293720d0f14840278d38b5feeb.patch;
+    sha256 = "192x3lqvd1fanasb95shdygn997qfrpk1k62k1f4j3s5chkwvjig";
  };

-  buildInputs = [ qmake4Hook qt4 protobuf boost tinyxml2 libgcrypt sqlite gsasl curl SDL SDL_mixer libircclient ];
+  revertPatch = patch: runCommand "revert-${patch.name}" {} ''
+    ${patchutils}/bin/interdiff ${patch} /dev/null > $out
+  '';
+in

-  outputs = [ "out" "server" ];
+stdenv.mkDerivation rec {
+  name = "pokerth-${target}-${version}";
+  version = "1.1.2";

-  qmakeFlags = [ "pokerth.pro" "DEFINES+=_WEBSOCKETPP_NOEXCEPT_TOKEN_=noexcept" ];
+  src = fetchFromGitHub {
+    owner = "pokerth";
+    repo = "pokerth";
+    rev = "f5688e01b0efb37035e3b0e3a432200185b9a0c5";
+    sha256 = "0la8d036pbscjnbxf8lkrqjfq8a4ywsfwxil452fhlays6mr19h0";
+  };

-  NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ];
+  patches = [
+    (revertPatch hiDPI)
+  ];

  postPatch = ''
-    for f in connectivity.pro load.pro pokerth_game.pro pokerth_server.pro
-    do
+    for f in *.pro; do
      substituteInPlace $f \
-        --replace 'LIB_DIRS =' 'LIB_DIRS = ${boost.out}/lib'
+        --replace '$$'{PREFIX}/include/libircclient ${libircclient.dev}/include/libircclient \
+        --replace 'LIB_DIRS =' 'LIB_DIRS = ${boost.out}/lib' \
+        --replace /opt/gsasl ${gsasl}
    done
  '';

+  nativeBuildInputs = [ qmake ];
+
+  buildInputs = [
+    SDL
+    SDL_mixer
+    boost
+    curl
+    gsasl
+    libgcrypt
+    libircclient
+    protobuf
+    qtbase
+    sqlite
+    tinyxml2
+  ];
+
+  qmakeFlags = [
+    "CONFIG+=${target}"
+    "pokerth.pro"
+  ];
+
+  NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ];
+
  enableParallelBuilding = true;

-  postInstall = ''
-    install -D -m755 bin/pokerth_server $server/bin/pokerth_server
-  '';
-
-  meta = with stdenv.lib; {
-    homepage    = https://www.pokerth.net;
-    description = "Open Source Poker client and server";
-    license     = licenses.gpl3;
-    maintainers = with maintainers; [ obadz ];
-    platforms   = platforms.all;
+  meta = {
+    homepage = https://www.pokerth.net;
+    description = "Poker game ${target}";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ obadz yegortimoshenko ];
+    platforms = platforms.all;
  };
 }
--- a/pkgs/misc/themes/sierra/default.nix
+++ b/pkgs/misc/themes/sierra/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "sierra-gtk-theme-${version}";
-  version = "2018-10-01";
+  version = "2018-10-12";

  src = fetchFromGitHub {
    owner = "vinceliuice";
    repo = "sierra-gtk-theme";
    rev = version;
-    sha256 = "10rjk2lyhlkhhfx6f6r0cykbkxa2jhri4wirc3h2wbzzsx7ch3ix";
+    sha256 = "0l8mhdy7x8nh5aqsvkk0maqg1cnfds7824g439f6cmifdiyksbgg";
  };

  nativeBuildInputs = [ libxml2 ];
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@ -94,7 +94,7 @@ with generated;
    # $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; clang.default_cxx_stdlib_compile')
    preFixup = ''
      substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
-        --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'"
+        --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'"
    '';
  });

--- a/pkgs/os-specific/linux/kernel/linux-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix
@ -3,7 +3,7 @@
 with stdenv.lib;

 buildLinux (args // rec {
-  version = "4.14.77";
+  version = "4.14.78";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1y567wkr4p7hywq3pdw06yc4hi16rp1vkx764wzy5nyajkhz95h4";
+    sha256 = "0v2cwykgd2hxlqja4yl4pq45nhd5x8917ixqq7hj1r3ry304vnpl";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-4.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.18.nix
@ -3,7 +3,7 @@
 with stdenv.lib;

 buildLinux (args // rec {
-  version = "4.18.15";
+  version = "4.18.16";

  # modDirVersion needs to be x.y.z, will automatically add .0 if needed
  modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg;
@ -13,6 +13,6 @@ buildLinux (args // rec {

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0cr9ash165yimwf8742c9cshfnjvmnzibyfrii9cnfig9m8m3hwg";
+    sha256 = "1rjjkhl8lz4y4sn7icy8mp6p1x7rvapybp51p92sanbjy3i19fmy";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

 buildLinux (args // rec {
-  version = "4.4.161";
+  version = "4.4.162";
  extraMeta.branch = "4.4";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "11rz66qvbcb6y3fz9k04jzn547sqdahqknd43imsr9sjgkaq60xy";
+    sha256 = "0l2agmxzmq89jbh7r00qg4msvmhny40m2jar96fibwpklwd44kki";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/os-specific/linux/kernel/linux-4.9.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix
@ -1,11 +1,11 @@
 { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args:

 buildLinux (args // rec {
-  version = "4.9.134";
+  version = "4.9.135";
  extraMeta.branch = "4.9";

  src = fetchurl {
    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0xvsk5q4w4sa3vk0rhckxn7faj12rvmfpwn08m4qf7024b8yiyvd";
+    sha256 = "1kjly5ynsg2jy5nj41z21s8f18wfs4nk843jlmmcazzax6xv08z0";
  };
 } // (args.argsOverride or {}))
--- a/pkgs/servers/mattermost/default.nix
+++ b/pkgs/servers/mattermost/default.nix
@ -1,7 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, buildGoPackage, buildEnv }:

 let
-  version = "5.3.0";
+  version = "5.4.0";

  mattermost-server = buildGoPackage rec {
    name = "mattermost-server-${version}";
@ -10,7 +10,7 @@ let
      owner = "mattermost";
      repo = "mattermost-server";
      rev = "v${version}";
-      sha256 = "0hll62ad12drlqarr7y7zvjj0b12snqm8j5k923lj0064nlpc47z";
+      sha256 = "0sal5ydm1cwnvf3acmiy0400ghhd6v0wj64mkxqwqf8ysnbxizwq";
    };

    goPackagePath = "github.com/mattermost/mattermost-server";
@ -27,7 +27,7 @@ let

    src = fetchurl {
      url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz";
-      sha256 = "1yzhy37frbhik6iq5z8bglpfcjlwnbgcf5iy1davkh7iqpcbxb0s";
+      sha256 = "06dg0f6nrh3a2v3lnyn2s39nj5jpsvfkx3ypq4zjpks0srv4mgfz";
    };

    installPhase = ''
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@ -1,8 +1,19 @@
-{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils }:
-
+{ stdenv, fetchurl, dpkg, gawk, perl, wget, coreutils, utillinux
+, gnugrep, gnutar, gnused, gzip, makeWrapper }:
 # USAGE like this: debootstrap sid /tmp/target-chroot-directory
 # There is also cdebootstrap now. Is that easier to maintain?
-stdenv.mkDerivation rec {
+let binPath = stdenv.lib.makeBinPath [
+    coreutils
+    dpkg
+    gawk
+    gnugrep
+    gnused
+    gnutar
+    gzip
+    perl
+    wget
+  ];
+in stdenv.mkDerivation rec {
  name = "debootstrap-${version}";
  version = "1.0.109";

@ -13,63 +24,43 @@ stdenv.mkDerivation rec {
    sha256 = "117xgrv6mpszyndmsvkn4ynh57b2s40qc68bpmfmxggw58j42klw";
  };

-  buildInputs = [ dpkg gettext gawk perl wget ];
+  nativeBuildInputs = [ makeWrapper ];

  dontBuild = true;

-  # If you have to update the patch for functions a vim regex like this
-  # can help you identify which lines are used to write scripts on TARGET and
-  # which should /bin/ paths should be replaced:
-  # \<echo\>\|\/bin\/\|^\s*\<cat\>\|EOF\|END
  installPhase = ''
-    sed -i \
-      -e 's@/usr/bin/id@id@' \
-      -e 's@/usr/bin/dpkg@${dpkg}/bin/dpkg@' \
-      -e 's@/usr/bin/sha@${coreutils}/bin/sha@' \
-      -e 's@/bin/sha@${coreutils}/bin/sha@' \
-      debootstrap
+    runHook preInstall

-    for file in functions debootstrap; do
-      substituteInPlace "$file" \
-        --subst-var-by gunzip "$(type -p gunzip)" \
-        --subst-var-by bunzip "$(type -p bunzip)" \
-        --subst-var-by gettext "$(type -p gettext)" \
-        --subst-var-by dpkg "$(type -p dpkg)" \
-        --subst-var-by udpkg "$(type -p udpkg)" \
-        --subst-var-by id "$(type -p id)" \
-        --subst-var-by perl "$(type -p perl)" \
-        --subst-var-by uname "$(type -p uname)" \
-        --subst-var-by wget "$(type -p wget)"
-    done
-
-
-    sed -i  \
-      -e 's@\<wget\>@${wget}/bin/wget@' \
-      functions
+    substituteInPlace debootstrap \
+      --replace 'CHROOT_CMD="chroot '  'CHROOT_CMD="${coreutils}/bin/chroot ' \
+      --replace 'CHROOT_CMD="unshare ' 'CHROOT_CMD="${utillinux}/bin/unshare ' \
+      --replace /usr/bin/dpkg ${dpkg}/bin/dpkg \
+      --replace '#!/bin/sh' '#!/bin/bash' \
+      --subst-var-by VERSION ${version}

    d=$out/share/debootstrap
    mkdir -p $out/{share/debootstrap,bin}

+    mv debootstrap $out/bin
+
    cp -r . $d

-    cat >> $out/bin/debootstrap << EOF
-    #!/bin/sh
-    export DEBOOTSTRAP_DIR="''${DEBOOTSTRAP_DIR:-$d}"
-    # mount and other tools must be found in chroot. So add default debain paths!
-    # TODO only add paths which are required by the scripts!
-    export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-    exec $d/debootstrap "\$@"
-    EOF
-    chmod +x $out/bin/debootstrap
+    wrapProgram $out/bin/debootstrap \
+      --set PATH ${binPath} \
+      --set-default DEBOOTSTRAP_DIR $d

    mkdir -p $out/man/man8
    mv debootstrap.8 $out/man/man8
+
+    rm -rf $d/debian
+
+    runHook postInstall
  '';

  meta = {
    description = "Tool to create a Debian system in a chroot";
-    homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap
-    license = stdenv.lib.licenses.gpl2; # gentoo says so.. ?
+    homepage = https://wiki.debian.org/Debootstrap;
+    license = stdenv.lib.licenses.mit;
    maintainers = [ stdenv.lib.maintainers.marcweber ];
    platforms = stdenv.lib.platforms.linux;
  };
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -15493,6 +15493,8 @@ with pkgs;

  vistafonts-chs = callPackage ../data/fonts/vista-fonts-chs { };

+  weather-icons = callPackage ../data/fonts/weather-icons { };
+
  wireless-regdb = callPackage ../data/misc/wireless-regdb { };

  wqy_microhei = callPackage ../data/fonts/wqy-microhei { };
@ -17720,6 +17722,8 @@ with pkgs;
    inherit (darwin.apple_sdk.frameworks) vmnet;
  };

+  minishift = callPackage ../applications/networking/cluster/minishift { };
+
  minitube = libsForQt5.callPackage ../applications/video/minitube { };

  mimic = callPackage ../applications/audio/mimic {
@ -20342,11 +20346,9 @@ with pkgs;

  pong3d = callPackage ../games/pong3d { };

-  pokerth = callPackage ../games/pokerth {
-    protobuf = protobuf3_4;
-  };
+  pokerth = libsForQt5.callPackage ../games/pokerth { };

-  pokerth-server = pokerth.server;
+  pokerth-server = libsForQt5.callPackage ../games/pokerth { target = "server"; };

  prboom = callPackage ../games/prboom { };

@ -21132,8 +21134,9 @@ with pkgs;
  sageWithDoc = sage.override { withDoc = true; };

  suitesparse_4_2 = callPackage ../development/libraries/science/math/suitesparse/4.2.nix { };
-  suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse {};
-  suitesparse = suitesparse_4_4;
+  suitesparse_4_4 = callPackage ../development/libraries/science/math/suitesparse/4.4.nix {};
+  suitesparse_5_3 = callPackage ../development/libraries/science/math/suitesparse {};
+  suitesparse = suitesparse_5_3;

  superlu = callPackage ../development/libraries/science/math/superlu {};

--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@ -95,6 +95,34 @@ let
    };
  };

+  AlienBuild = buildPerlPackage {
+    name = "Alien-Build-1.48";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-Build-1.48.tar.gz;
+      sha256 = "1sv4544g2qhwigpj1x2qycafab04p2b0vdr2x07wzriq5fqgsspp";
+    };
+    propagatedBuildInputs = [ CaptureTiny FFICheckLib FileWhich Filechdir PathTiny Test2Suite ];
+    buildInputs = [ DevelHide PkgConfig ];
+    meta = {
+      description = "Build external dependencies for use in CPAN";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
+  AlienGMP = buildPerlPackage {
+    name = "Alien-GMP-1.14";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PL/PLICEASE/Alien-GMP-1.14.tar.gz;
+      sha256 = "116vvh1b0d1ykkklqgfxfn89g3bw90a4cj3qrvsnkw1kk5cmn60a";
+    };
+    propagatedBuildInputs = [ AlienBuild ];
+    buildInputs = [ pkgs.gmp DevelChecklib ];
+    meta = {
+      description = "Alien package for the GNU Multiple Precision library.";
+      license = with stdenv.lib.licenses; [ lgpl3Plus ];
+    };
+  };
+
  aliased = buildPerlModule rec {
    name = "aliased-0.34";
    src = fetchurl {
@ -2857,6 +2885,18 @@ let
    };
  };

+  CryptCurve25519 = buildPerlPackage {
+    name = "Crypt-Curve25519-0.06";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/A/AJ/AJGB/Crypt-Curve25519-0.06.tar.gz;
+      sha256 = "1ir0gfxm8i7r9zyfs2zvil5jgwirl7j6cb9cm1p2kjpfnhyp0j4z";
+    };
+    meta = {
+      description = "Generate shared secret using elliptic-curve Diffie-Hellman function";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
  CryptDES = buildPerlPackage rec {
    name = "Crypt-DES-2.07";
    src = fetchurl {
@ -2894,6 +2934,14 @@ let
    propagatedBuildInputs = [ ClassMix ];
  };

+  CryptIDEA = buildPerlPackage {
+    name = "Crypt-IDEA-1.10";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/D/DP/DPARIS/Crypt-IDEA-1.10.tar.gz;
+      sha256 = "0690lzlyjqgmnb94dq7dm5n6pgybg10fkpgfycgzr814370pig9k";
+    };
+  };
+
  CryptJWT = buildPerlPackage rec {
    name = "Crypt-JWT-0.023";
    src = fetchurl {
@ -5590,6 +5638,19 @@ let
    };
  };

+  FFICheckLib = buildPerlPackage {
+    name = "FFI-CheckLib-0.20";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/P/PL/PLICEASE/FFI-CheckLib-0.20.tar.gz;
+      sha256 = "1pggqj5cs77myp4g62jzkld95a286vwkygi7i0hbqjgwf3w3f5gl";
+    };
+    buildInputs = [ Test2Suite ];
+    meta = {
+      description = "Check that a library is available for FFI";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
  FennecLite = buildPerlModule {
    name = "Fennec-Lite-0.004";
    src = fetchurl {
@ -9239,6 +9300,21 @@ let
    };
  };

+  MathGMP = buildPerlPackage {
+    name = "Math-GMP-2.19";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SH/SHLOMIF/Math-GMP-2.19.tar.gz;
+      sha256 = "1c07521m4d38hy2yx21hkwz22n2672bvrc4i21ldc68h85qy1q8i";
+    };
+    buildInputs = [ pkgs.gmp AlienGMP ];
+    NIX_CFLAGS_COMPILE = "-I${pkgs.gmp.dev}/include";
+    NIX_CFLAGS_LINK = "-L${pkgs.gmp.out}/lib -lgmp";
+    meta = {
+      description = "High speed arbitrary size integer math";
+      license = with stdenv.lib.licenses; [ lgpl21Plus ];
+    };
+  };
+
  MathGeometryVoronoi = buildPerlPackage rec {
    name = "Math-Geometry-Voronoi-1.3";
    src = fetchurl {
@ -11384,6 +11460,20 @@ let
    };
  };

+  NetSSHPerl = buildPerlPackage rec {
+    name = "Net-SSH-Perl-2.14";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/S/SC/SCHWIGON/Net-SSH-Perl-2.14.tar.gz;
+      sha256 = "2b5d1bb13590b5870116704e7f1dce9a9823c4f80ff5461b97bb26a317393017";
+    };
+    propagatedBuildInputs = [ CryptCurve25519 CryptIDEA CryptX FileHomeDir MathGMP StringCRC32 ];
+    preCheck = "export HOME=$TMPDIR";
+    meta = {
+      description = "Perl client Interface to SSH";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
  NetSSLeay = buildPerlPackage rec {
    name = "Net-SSLeay-1.85";
    src = fetchurl {