Merge commit 'da1a2b1eeafa66b4419b4f275396d8a731eccb61'

56 files changed, 430 insertions, 149 deletions

diff --git a/nixpkgs/pkgs/development/libraries/appstream/default.nix b/nixpkgs/pkgs/development/libraries/appstream/default.nix
index 5b9b4beed7ab..f59a3fd713f9 100644
--- a/nixpkgs/pkgs/development/libraries/appstream/default.nix
+++ b/nixpkgs/pkgs/development/libraries/appstream/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "appstream-${version}";
-  version = "0.12.5";
+  version = "0.12.6";
 
   src = fetchFromGitHub {
     owner  = "ximion";
     repo   = "appstream";
     rev    = "APPSTREAM_${stdenv.lib.replaceStrings ["."] ["_"] version}";
-    sha256 = "1h68raflp04r79c58vyy3mmcixs5bqffm2d1js7mxfypmi4mvv6r";
+    sha256 = "0hbl26aw3g2hag7z4di9z59qz057qcywrxpnnmp86z7rngvjbqpx";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix
index 2962e099f255..84340a25bb1d 100644
--- a/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/at-spi2-atk/default.nix
@@ -18,11 +18,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "at-spi2-atk";
-  version = "2.30.0";
+  version = "2.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "16lav8k3mcxf2hblfh95zcw41glmb92wwwwljrf10yza0h85gqg2";
+    sha256 = "1rxqp9kgf8mcyg84b9pq2kpqr1ws81ijn9nfdis2w0ixy9cbjfyr";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig ]
diff --git a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix
index cae674809644..759666c827e9 100644
--- a/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix
+++ b/nixpkgs/pkgs/development/libraries/at-spi2-core/default.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "at-spi2-core";
-  version = "2.30.0";
+  version = "2.30.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0azvgdmmivfz1fki25mz582gmwvfpajcnqhlq7s53nhr7lwzax81";
+    sha256 = "0j6aa071lnhpgv9h8l0pqimk8pc152gqpcbmq8djlj7h3f7iyvw5";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/nixpkgs/pkgs/development/libraries/boost/1.66.nix b/nixpkgs/pkgs/development/libraries/boost/1.66.nix
index e8321c802359..b44c1a3823a9 100644
--- a/nixpkgs/pkgs/development/libraries/boost/1.66.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.66.nix
@@ -1,7 +1,7 @@
 { stdenv, callPackage, fetchurl, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "1.66_0";
+  version = "1.66.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/boost/boost_1_66_0.tar.bz2";
diff --git a/nixpkgs/pkgs/development/libraries/boost/1.67.nix b/nixpkgs/pkgs/development/libraries/boost/1.67.nix
index 0f341217dcab..938892ef3554 100644
--- a/nixpkgs/pkgs/development/libraries/boost/1.67.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.67.nix
@@ -1,7 +1,7 @@
 { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "1.67_0";
+  version = "1.67.0";
 
   patches = [ (fetchpatch {
     url = "https://github.com/boostorg/lockfree/commit/12726cda009a855073b9bedbdce57b6ce7763da2.patch";
diff --git a/nixpkgs/pkgs/development/libraries/boost/1.68.nix b/nixpkgs/pkgs/development/libraries/boost/1.68.nix
index 97879051a67c..cd980439b710 100644
--- a/nixpkgs/pkgs/development/libraries/boost/1.68.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.68.nix
@@ -1,7 +1,7 @@
 { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "1.68_0";
+  version = "1.68.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/boost/boost_1_68_0.tar.bz2";
diff --git a/nixpkgs/pkgs/development/libraries/boost/1.69.nix b/nixpkgs/pkgs/development/libraries/boost/1.69.nix
index 798db8dd46e4..959fa851fe22 100644
--- a/nixpkgs/pkgs/development/libraries/boost/1.69.nix
+++ b/nixpkgs/pkgs/development/libraries/boost/1.69.nix
@@ -1,7 +1,7 @@
 { stdenv, callPackage, fetchurl, fetchpatch, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "1.69_0";
+  version = "1.69.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/boost/boost_1_69_0.tar.bz2";
diff --git a/nixpkgs/pkgs/development/libraries/boringssl/default.nix b/nixpkgs/pkgs/development/libraries/boringssl/default.nix
index 1fa503ad955d..ee62d5423a15 100644
--- a/nixpkgs/pkgs/development/libraries/boringssl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/boringssl/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
   NIX_CFLAGS_COMPILE = "-Wno-error";
 
-  GOCACHE="$TMPDIR/go-cache";
+  makeFlags = [ "GOCACHE=$(TMPDIR)/go-cache" ];
 
   installPhase = ''
     mkdir -p $out/bin $out/include $out/lib
diff --git a/nixpkgs/pkgs/development/libraries/cgui/default.nix b/nixpkgs/pkgs/development/libraries/cgui/default.nix
index da9d1122cc54..df75d3a1f1da 100644
--- a/nixpkgs/pkgs/development/libraries/cgui/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cgui/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, texinfo, allegro, perl }:
+{ stdenv, fetchurl, texinfo, allegro, perl, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "cgui-${version}";
-  version="2.0.3";
+  version="2.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/cgui/${version}/${name}.tar.gz";
-    sha256 = "00kk4xaw68m44awy8zq4g5plx372swwccvzshn68a0a8f3f2wi4x";
+    sha256 = "1pp1hvidpilq37skkmbgba4lvzi01rasy04y0cnas9ck0canv00s";
   };
 
-  buildInputs = [ texinfo allegro perl ];
+  buildInputs = [ texinfo allegro perl libX11 ];
 
   configurePhase = ''
     sh fix.sh unix
diff --git a/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch b/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch
new file mode 100644
index 000000000000..47f419727459
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/civetweb/0001-allow-setting-paths-in-makefile.patch
@@ -0,0 +1,55 @@
+From 06b2c6dd6439c01bfb5a4c7b0ec6909c349a66b1 Mon Sep 17 00:00:00 2001
+From: Frederik Rietdijk <freddyrietdijk@fridh.nl>
+Date: Thu, 28 Feb 2019 16:25:49 +0100
+Subject: [PATCH] allow setting paths in makefile
+
+and install headers and libs
+---
+ Makefile | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index b507e2b0..d21e5c56 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,13 +19,13 @@ BUILD_DIR = out
+ # http://www.gnu.org/prep/standards/html_node/Directory-Variables.html
+ PREFIX ?= /usr/local
+ EXEC_PREFIX = $(PREFIX)
+-BINDIR = $(EXEC_PREFIX)/bin
++BINDIR ?= $(EXEC_PREFIX)/bin
+ DATAROOTDIR = $(PREFIX)/share
+ DOCDIR = $(DATAROOTDIR)/doc/$(CPROG)
+ SYSCONFDIR = $(PREFIX)/etc
+ HTMLDIR = $(DOCDIR)
+-INCLUDEDIR = $(DESTDIR)$(PREFIX)/include
+-LIBDIR = $(DESTDIR)$(EXEC_PREFIX)/lib
++INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include
++LIBDIR ?= $(DESTDIR)$(EXEC_PREFIX)/lib
+ 
+ # build tools
+ MKDIR = mkdir -p
+@@ -270,17 +270,17 @@ build: $(CPROG) $(CXXPROG)
+ unit_test: $(UNIT_TEST_PROG)
+ 
+ ifeq ($(CAN_INSTALL),1)
+-install: $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf
++install: install-headers install-slib $(HTMLDIR)/index.html $(SYSCONFDIR)/civetweb.conf
+ 	install -d -m 755  "$(DOCDIR)"
+ 	install -m 644 *.md "$(DOCDIR)"
+ 	install -d -m 755 "$(BINDIR)"
+ 	install -m 755 $(CPROG) "$(BINDIR)/"
+ 
+ install-headers:
+-	install -m 644 $(HEADERS) "$(INCLUDEDIR)"
++	install -m 644 $(HEADERS) "$(INCLUDEDIR)/"
+ 
+ install-lib: lib$(CPROG).a
+-	install -m 644 $< "$(LIBDIR)"
++	install -m 644 $< "$(LIBDIR)/"
+ 
+ install-slib: lib$(CPROG).so
+ 	$(eval version=$(shell grep -w "define CIVETWEB_VERSION" include/civetweb.h | sed 's|.*VERSION "\(.*\)"|\1|g'))
+-- 
+2.19.2
+
diff --git a/nixpkgs/pkgs/development/libraries/civetweb/default.nix b/nixpkgs/pkgs/development/libraries/civetweb/default.nix
new file mode 100644
index 000000000000..3f8de005ff81
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/civetweb/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "civetweb";
+  version = "1.11";
+
+  src = fetchFromGitHub {
+    owner = pname;
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256:1drnid6gs97cp9zpvsxz42yfj8djmgx98fg9p2993x9mpi547vzv";
+  };
+
+  makeFlags = [
+    "WITH_CPP=1"
+    "PREFIX=${placeholder "out"}"
+    "LIBDIR=${placeholder "out"}/lib"
+    "INCLUDEDIR=${placeholder "dev"}/include"
+  ];
+
+  patches = [
+    ./0001-allow-setting-paths-in-makefile.patch
+  ];
+
+  strictDeps = true;
+
+  outputs = [ "out" "dev" ];
+
+  preInstall = ''
+    mkdir -p $dev/include
+    mkdir -p $out/lib
+  '';
+
+  meta = {
+    description = "Embedded C/C++ web server";
+    homepage = https://github.com/civetweb/civetweb;
+    license = [ stdenv.lib.licenses.mit ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix
index 7b130d48928e..06eac4423e78 100644
--- a/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/cyrus-sasl/default.nix
@@ -4,7 +4,7 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "cyrus-sasl-${version}${optionalString (kerberos == null) "-without-kerberos"}";
+  name = "cyrus-sasl-${version}";
   version = "2.1.27";
 
   src = fetchurl {
diff --git a/nixpkgs/pkgs/development/libraries/double-conversion/default.nix b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix
index 96375fcd5beb..04fd04a564f8 100644
--- a/nixpkgs/pkgs/development/libraries/double-conversion/default.nix
+++ b/nixpkgs/pkgs/development/libraries/double-conversion/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "double-conversion-${version}";
-  version = "3.1.1";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "double-conversion";
     rev = "v${version}";
-    sha256 = "123rb2p4snqagrybw66vnapchqdwn2rfpr1wcq0ya9gwbyl7xccx";
+    sha256 = "082w15xq8f4c422a71phvcahgc8vmqrig97av9g9628q5n2ybbgg";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/development/libraries/eccodes/default.nix b/nixpkgs/pkgs/development/libraries/eccodes/default.nix
index c26956f6ea24..4eaded814366 100644
--- a/nixpkgs/pkgs/development/libraries/eccodes/default.nix
+++ b/nixpkgs/pkgs/development/libraries/eccodes/default.nix
@@ -6,11 +6,11 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "eccodes-${version}";
-  version = "2.10.0";
+  version = "2.12.0";
 
   src = fetchurl {
     url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    sha256 = "1n429najxlq6y76wyx1mbw41b0l4prdhfmy4id9ni8zwm96cp8xy";
+    sha256 = "0rqkx6p85b0v6zdkm4q2r516b7ldkxhkfc0cwkl24djlkv7fanpp";
   };
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
index 53ab9382cde3..f7968380e29b 100644
--- a/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -419,7 +419,7 @@ stdenv.mkDerivation rec {
     ++ optionals nvenc [ nvidia-video-sdk nv-codec-headers ]
     ++ optionals stdenv.isDarwin [ Cocoa CoreServices CoreAudio AVFoundation
                                    MediaToolbox VideoDecodeAcceleration
-                                   libiconv ];
+                                   libiconv cf-private /* For _OBJC_EHTYPE_$_NSException */ ];
 
   # Build qt-faststart executable
   buildPhase = optional qtFaststartProgram ''make tools/qt-faststart'';
diff --git a/nixpkgs/pkgs/development/libraries/filter-audio/default.nix b/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
index 9dc0776f08a7..4a2bed6b4979 100644
--- a/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
+++ b/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
@@ -18,9 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Lightweight audio filtering library made from webrtc code";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
-
-
diff --git a/nixpkgs/pkgs/development/libraries/flatcc/default.nix b/nixpkgs/pkgs/development/libraries/flatcc/default.nix
new file mode 100644
index 000000000000..f3d06f7a01ab
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/flatcc/default.nix
@@ -0,0 +1,29 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "flatcc";
+  version = "0.5.2";
+
+  src = fetchFromGitHub {
+    owner = "dvidelabs";
+    repo = "flatcc";
+    rev = "v${version}";
+    sha256 = "sha256:0cb6s9q1cbigss1q7dra0ix2a0iqlh2xxwncbrnmqv17h4lwvglr";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [
+    "-DFLATCC_INSTALL=on"
+    "-DCMAKE_BUILD_TYPE=Release"
+  ];
+
+  meta = {
+    description = "FlatBuffers Compiler and Library in C for C ";
+    homepage = https://github.com/dvidelabs/flatcc;
+    license = [ stdenv.lib.licenses.asl20 ];
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
index 5ce08cbe636f..dc5c2024c02a 100644
--- a/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
@@ -1,17 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake }:
+{ stdenv, fetchFromGitHub, cmake, gtest }:
 
 stdenv.mkDerivation rec {
   name = "gbenchmark-${version}";
-  version = "1.3.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "benchmark";
     rev = "v${version}";
-    sha256 = "1qx2dp7y0haj6wfbbfw8hx8sxb8ww0igdfrmmaaxfl0vhckylrxh";
+    sha256 = "0l1f6azka85fkb8kdmh4qmmpxhsv7lr7wvll6sld31mfz0cai1kd";
   };
 
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
+
+  buildInputs = [ gtest ];
 
   enableParallelBuilding = true;
 
diff --git a/nixpkgs/pkgs/development/libraries/gdome2/default.nix b/nixpkgs/pkgs/development/libraries/gdome2/default.nix
index 306f228051bb..e8982c4b70a4 100644
--- a/nixpkgs/pkgs/development/libraries/gdome2/default.nix
+++ b/nixpkgs/pkgs/development/libraries/gdome2/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, glib, libxml2, gtkdoc}:
+{stdenv, fetchurl, pkgconfig, glib, libxml2, gtk-doc}:
 
 let
   pname = "gdome2";
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   hardeningDisable = [ "format" ];
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ glib libxml2 gtkdoc];
+  buildInputs = [ glib libxml2 gtk-doc ];
   propagatedBuildInputs = [glib libxml2];
   patches = [ ./xml-document.patch ];
 
diff --git a/nixpkgs/pkgs/development/libraries/glib/default.nix b/nixpkgs/pkgs/development/libraries/glib/default.nix
index e0255be666e9..4c7c51dbdff5 100644
--- a/nixpkgs/pkgs/development/libraries/glib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/glib/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales
+{ config, stdenv, fetchurl, fetchpatch, gettext, meson, ninja, pkgconfig, perl, python3, glibcLocales
 , libiconv, zlib, libffi, pcre, libelf, gnome3, libselinux, bash, gnum4, gtk-doc, docbook_xsl, docbook_xml_dtd_45
 # use utillinuxMinimal to avoid circular dependency (utillinux, systemd, glib)
 , utillinuxMinimal ? null
 , buildPackages
 
 # this is just for tests (not in the closure of any regular package)
-, doCheck ? stdenv.config.doCheckByDefault or false
+, doCheck ? config.doCheckByDefault or false
 , coreutils, dbus, libxml2, tzdata
 , desktop-file-utils, shared-mime-info
 , darwin
diff --git a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
index 35966442da2d..53a3210caca8 100644
--- a/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
+++ b/nixpkgs/pkgs/development/libraries/hyperscan/default.nix
@@ -10,12 +10,12 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "hyperscan";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "hyperscan";
-    sha256 = "017dxg0n3gn9i4j27rcvpnp4rkqgycqni6x5d15dqpidl7zg7059";
+    sha256 = "0r2c7s7alnq14yhbfhpkq6m28a3pyfqd427115k0754afxi82vbq";
     rev = "v${version}";
   };
 
diff --git a/nixpkgs/pkgs/development/libraries/ldns/default.nix b/nixpkgs/pkgs/development/libraries/ldns/default.nix
index 468ab90edb5b..82496a54aea7 100644
--- a/nixpkgs/pkgs/development/libraries/ldns/default.nix
+++ b/nixpkgs/pkgs/development/libraries/ldns/default.nix
@@ -66,6 +66,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     homepage = http://www.nlnetlabs.nl/projects/ldns/;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ ];
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libcmis/default.nix b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
index f1e57272d0b8..53474190ce96 100644
--- a/nixpkgs/pkgs/development/libraries/libcmis/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libcmis/default.nix
@@ -1,22 +1,27 @@
-{ stdenv, fetchurl, boost, libxml2, pkgconfig, curl, autoreconfHook }:
+{ stdenv, fetchFromGitHub, boost, libxml2, pkgconfig, docbook2x, curl, autoreconfHook, cppunit }:
 
 stdenv.mkDerivation rec {
-  name = "libcmis-${version}";
-  version = "0.5.0";
+  pname = "libcmis";
+  version = "0.5.2";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/libcmis/${name}.tar.gz";
-    sha256 = "1dprvk4fibylv24l7gr49gfqbkfgmxynvgssvdcycgpf7n8h4zm8";
+  src = fetchFromGitHub {
+    owner = "tdf";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "0s6prfh55hn11vrs72ph1gs01v0vngly81pvyjm5v1sgwymdxx57";
   };
 
-  patches = [ ./gcc5.patch ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig docbook2x ];
+  buildInputs = [ boost libxml2 curl cppunit ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig ];
-  buildInputs = [ boost libxml2 curl ];
-  configureFlags = [ "--without-man" "--with-boost=${boost.dev}" "--disable-werror" "--disable-tests" ];
+  configureFlags = [
+    "--disable-werror"
+    "DOCBOOK2MAN=${docbook2x}/bin/docbook2man"
+  ];
 
-  # Cppcheck cannot find all the include files (use --check-config for details)
-  doCheck = false;
+  doCheck = true;
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     description = "C++ client library for the CMIS interface";
diff --git a/nixpkgs/pkgs/development/libraries/libcmis/gcc5.patch b/nixpkgs/pkgs/development/libraries/libcmis/gcc5.patch
deleted file mode 100644
index 952f8e1abd70..000000000000
--- a/nixpkgs/pkgs/development/libraries/libcmis/gcc5.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -urN libcmis-0.5.0.org/m4/boost.m4 libcmis-0.5.0/m4/boost.m4
---- libcmis-0.5.0.org/m4/boost.m4      2014-03-28 15:19:57.000000000 +0100
-+++ libcmis-0.5.0/m4/boost.m4  2015-09-21 14:42:25.149565264 +0200
-@@ -68,7 +68,9 @@
- dnl everything else.
- dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK
- (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD |
-+  grep -v '#' |
-   tr -d '\r' |
-+  tr -s '\n' ' ' |
-   $SED -n -e "$1" >conftest.i 2>&1],
-   [$3],
-   [$4])
-@@ -201,7 +203,7 @@
-   AC_CACHE_CHECK([for Boost's header version],
-     [boost_cv_lib_version],
-     [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl
--     _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;g;}],
-+     _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]],
-                     [#include <boost/version.hpp>
- boost-lib-version = BOOST_LIB_VERSION],
-     [boost_cv_lib_version=`cat conftest.i`])])
-@@ -209,7 +211,7 @@
-     boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'`
-     case $boost_major_version in #(
-       '' | *[[!0-9]]*)
--        AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version])
-+        AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version'])
-         ;;
-     esac
- fi
-@@ -930,6 +932,7 @@
-   # the same defines as GCC's).
-   # TODO: Move the test on GCC 4.4 up once it's released.
-   for i in \
-+    _BOOST_gcc_test(5, 2) \
-     _BOOST_gcc_test(4, 3) \
-     _BOOST_gcc_test(4, 2) \
-     _BOOST_gcc_test(4, 1) \
diff --git a/nixpkgs/pkgs/development/libraries/libcryptui/default.nix b/nixpkgs/pkgs/development/libraries/libcryptui/default.nix
new file mode 100644
index 000000000000..fef8e7f510df
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libcryptui/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, pkgconfig, intltool, glib, gnome3, gtk3, gnupg20, gpgme, dbus-glib, libgnome-keyring }:
+
+stdenv.mkDerivation rec {
+  pname = "libcryptui";
+  version = "3.12.2";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0rh8wa5k2iwbwppyvij2jdxmnlfjbna7kbh2a5n7zw4nnjkx3ski";
+  };
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ glib gtk3 gnupg20 gpgme dbus-glib libgnome-keyring ];
+  propagatedBuildInputs = [ dbus-glib ];
+
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+    };
+  };
+
+  meta = with stdenv.lib; {
+    description = "Interface components for OpenPGP";
+    homepage = https://gitlab.gnome.org/GNOME/libcryptui;
+    license = licenses.lgpl21Plus;
+    platforms = platforms.unix;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
index edd84d5a9515..1a4da7713af4 100644
--- a/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libdwarf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libelf }:
+{ stdenv, fetchurl, libelf, zlib }:
 
 let
   version = "20181024";
@@ -24,7 +24,7 @@ in rec {
     preConfigure = ''
       cd libdwarf
     '';
-    buildInputs = [ libelf ];
+    buildInputs = [ libelf zlib ];
 
     installPhase = ''
       mkdir -p $out/lib $out/include
diff --git a/nixpkgs/pkgs/development/libraries/libgnurl/default.nix b/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
index 1a00822f66d3..e87f535a1f74 100644
--- a/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
@@ -2,13 +2,13 @@
   libidn2, libunistring, nghttp2 }:
 
 stdenv.mkDerivation rec {
-  version = "7.63.0";
+  version = "7.64.0";
 
   name = "libgnurl-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnurl-${version}.tar.gz";
-    sha256 = "15y4yjy67n3c57kp0yszklcrz2nickrvjvd6laizs6kdbpixjdfl";
+    sha256 = "0pvmbi32lixcpk10prplmwrmi4wzp3bc1aiyhr552kx0wqdqmdk8";
   };
 
   nativeBuildInputs = [ libtool groff perl pkgconfig python2 ];
diff --git a/nixpkgs/pkgs/development/libraries/libhandy/default.nix b/nixpkgs/pkgs/development/libraries/libhandy/default.nix
index 3fad34ce0d0a..d32bb82abcb9 100644
--- a/nixpkgs/pkgs/development/libraries/libhandy/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libhandy/default.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "libhandy";
-  version = "0.0.8";
+  version = "0.0.9";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
     owner = "Librem5";
     repo = pname;
     rev = "v${version}";
-    sha256 = "04jyllwdrapw24f34pjc2gbmfapjfin8iw0g3qfply7ciy08k1wj";
+    sha256 = "0smfnvfba6cnxbrcm1vh3zbr1hww43qcxhawka3hzn2hjr06rfzn";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
index 6a9cab16e7ed..24dd34d7a6a3 100644
--- a/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
+++ b/nixpkgs/pkgs/development/libraries/liblangtag/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtkdoc, gettext
+{stdenv, fetchurl, fetchFromBitbucket, autoreconfHook, gtk-doc, gettext
 , pkgconfig, glib, libxml2, gobject-introspection, gnome-common, unzip
 }:
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gettext glib libxml2 gobject-introspection gnome-common
     unzip ];
-  nativeBuildInputs = [ autoreconfHook gtkdoc gettext pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook gtk-doc gettext pkgconfig ];
 
   meta = {
     inherit version;
diff --git a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix
index e0f3be230709..e947ec22bf84 100644
--- a/nixpkgs/pkgs/development/libraries/libosinfo/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libosinfo/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libosinfo-1.2.0";
+  name = "libosinfo-1.4.0";
 
   src = fetchurl {
     url = "https://releases.pagure.org/libosinfo/${name}.tar.gz";
-    sha256 = "0y2skfrcg38y212qqd26vs3sg566j3qnsgvvm23pfi4j7z7ly9gf";
+    sha256 = "0ra1p2rnnwkq0181ayn0l0rs1pvk4a0i8fa08nqjfmqs5fl637m2";
   };
 
   outputs = [ "out" "dev" "devdoc" ];
@@ -20,16 +20,6 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./osinfo-db-data-dir.patch
-    # Fix bug causing tests to fail (and presumably the real scenarios they're representative of)
-    # using upstream commits:
-    (fetchpatch {
-      url = "https://gitlab.com/libosinfo/libosinfo/commit/b9cb227842948b1b2289cdd3e9b8d925664c2ee7.patch";
-      sha256 = "0nj0wmibq52j8qbzmxfzj76fpkqjs18kssbb9lmfhz16s30darbw";
-    })
-    (fetchpatch {
-      url = "https://gitlab.com/libosinfo/libosinfo/commit/e6168463f4fc659b9827b5c8694dc1c6d7d5239a.patch";
-      sha256 = "135yfhjm2wxip5dnng3r9k9igfhdi1083ys4a4f3ipjxfskcs9rv";
-    })
   ];
 
   postPatch = ''
diff --git a/nixpkgs/pkgs/development/libraries/libosmium/default.nix b/nixpkgs/pkgs/development/libraries/libosmium/default.nix
index 1b7bcc8fa896..791e4d890f93 100644
--- a/nixpkgs/pkgs/development/libraries/libosmium/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libosmium/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libosmium-${version}";
-  version = "2.15.0";
+  version = "2.15.1";
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "libosmium";
     rev = "v${version}";
-    sha256 = "0s51qk7py5dzr07q4a78b4mjjrpgbghnj2r8yjq1hnn6pgafbjv0";
+    sha256 = "1v1m068lcjngxnwirpi0vqjhqnxn9gqvafjp3sy14vzmgl2sw2kr";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/development/libraries/libplist/default.nix b/nixpkgs/pkgs/development/libraries/libplist/default.nix
index 0d6e3b8db6e0..904206ab79be 100644
--- a/nixpkgs/pkgs/development/libraries/libplist/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libplist/default.nix
@@ -5,15 +5,15 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libplist";
-  version = "2018-07-25";
+  version = "2019-01-20";
 
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = pname;
-    rev = "db68a9d1070b363eee93147f072f46526064acbc";
-    sha256 = "0lxyb35jjg31m8dxhsv1jr2ccy5s19fsqzisy7lfjk46w7brs4h5";
+    rev = "bec850fe399639f3b8582a39386216970dea15ed";
+    sha256 = "197yw8xz8x2xld8b6975scgnl30j4ibm9llmzljyqngs0zsdwnin";
   };
 
   outputs = ["bin" "dev" "out" "py"];
diff --git a/nixpkgs/pkgs/development/libraries/libr3/default.nix b/nixpkgs/pkgs/development/libraries/libr3/default.nix
new file mode 100644
index 000000000000..cf848d02a048
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/libr3/default.nix
@@ -0,0 +1,33 @@
+{ stdenv
+, fetchFromGitHub
+, pcre
+, pkgconfig
+, check
+, autoreconfHook
+}:
+
+stdenv.mkDerivation rec {
+  pname = "r3";
+  version = "1.3.4";
+
+  src = fetchFromGitHub {
+    owner = "c9s";
+    repo = "r3";
+    rev = version;
+    sha256 = "09cixbms817p6nb77wz3rxp0znnac8ybycvsrrzgwlbfn58a3zwl";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  buildInputs = [ check ];
+  propagatedBuildInputs = [ pcre ];
+
+  strictDeps = true;
+
+  meta = {
+    description = "A high-performance path dispatching library";
+    homepage = https://github.com/c9s/r3;
+    license = [ stdenv.lib.licenses.mit ];
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/libraries/librdf/default.nix b/nixpkgs/pkgs/development/libraries/librdf/default.nix
index 41047796662e..39fb68fd2467 100644
--- a/nixpkgs/pkgs/development/libraries/librdf/default.nix
+++ b/nixpkgs/pkgs/development/libraries/librdf/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, autoreconfHook
+{ config, stdenv, fetchurl, pkgconfig, autoreconfHook
 , librdf_raptor2, ladspaH, openssl, zlib
-, doCheck ? stdenv.config.doCheckByDefault or false, ladspaPlugins
+, doCheck ? config.doCheckByDefault or false, ladspaPlugins
 }:
 
 stdenv.mkDerivation rec {
diff --git a/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix b/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix
index 401d9c7d8a2e..c3981f5c58ea 100644
--- a/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix
+++ b/nixpkgs/pkgs/development/libraries/libtoxcore/new-api.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ jgeerds ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.all;
   };
 }
diff --git a/nixpkgs/pkgs/development/libraries/libunique/3.x.nix b/nixpkgs/pkgs/development/libraries/libunique/3.x.nix
index a072591ca9db..b302e1d0ba03 100644
--- a/nixpkgs/pkgs/development/libraries/libunique/3.x.nix
+++ b/nixpkgs/pkgs/development/libraries/libunique/3.x.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig
 , dbus, dbus-glib, gtk3, gobject-introspection
-, gtkdoc, docbook_xml_dtd_45, docbook_xsl
+, gtk-doc, docbook_xml_dtd_45, docbook_xsl
 , libxslt, libxml2 }:
 
 with stdenv.lib;
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   minorVer = "2";
   version = "${majorVer}.${minorVer}";
   name = "libunique3-${version}";
-  srcName = "libunique-${version}";  
+  srcName = "libunique-${version}";
 
   src = fetchurl {
     url = "http://ftp.gnome.org/pub/GNOME/sources/libunique/${majorVer}/${srcName}.tar.xz";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtkdoc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
+  buildInputs = [ dbus dbus-glib gtk3 gobject-introspection gtk-doc docbook_xml_dtd_45 docbook_xsl libxslt libxml2 ];
 
   meta = {
     homepage = https://wiki.gnome.org/Attic/LibUnique;
diff --git a/nixpkgs/pkgs/development/libraries/libwhereami/default.nix b/nixpkgs/pkgs/development/libraries/libwhereami/default.nix
index 880ebcc1e468..2af550c7d99a 100644
--- a/nixpkgs/pkgs/development/libraries/libwhereami/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libwhereami/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "libwhereami-${version}";
-  version = "0.2.0";
+  version = "0.2.2";
 
   src = fetchFromGitHub {
-    sha256 = "10phq4a11m8ly6b4dc2yg3dnjzg8ad5wnjv0ilvwylnw32800pxr";
+    sha256 = "084n153jaq8fmhjififk0xlx1d1i3lclnw2j3ly8bixvc392vzly";
     rev = version;
     repo = "libwhereami";
     owner = "puppetlabs";
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     maintainers = [ maintainers.womfoo ];
     platforms = platforms.linux;
+    badPlatforms = platforms.arm;
   };
 
 }
diff --git a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
index bdf210a061a9..61cae1b68ba7 100644
--- a/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
+++ b/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "libxmlb-${version}";
-  version = "0.1.6";
+  version = "0.1.7";
 
   outputs = [ "out" "lib" "dev" "devdoc" ];
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     owner = "hughsie";
     repo = "libxmlb";
     rev = version;
-    sha256 = "194slg11lp2i8zvc4a3zkzshps7qglzmrabp5k0r92rampx4dbwa";
+    sha256 = "17q1kjkff0frvm26agbqi0hdhg5d4icwn36qzf3y53wrdv5s148x";
   };
 
   nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ];
diff --git a/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix b/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix
new file mode 100644
index 000000000000..8808ccefeaf1
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/multipart-parser-c/default.nix
@@ -0,0 +1,34 @@
+{ stdenv
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation rec {
+  pname = "multipart-parser-c";
+  version = "unstable-2015-12-14";
+
+  src = fetchFromGitHub {
+    owner = "iafonov";
+    repo = pname;
+    rev = "772639cf10db6d9f5a655ee9b7eb20b815fab396";
+    sha256 = "sha256:056r63vj8f1rwf3wk7jmwhm8ba25l6h1gs6jnkh0schbwcvi56xl";
+  };
+
+  buildPhase = ''
+    make solib
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib
+    mv lib*${stdenv.targetPlatform.extensions.sharedLibrary} $out/lib/
+
+    mkdir -p $out/include
+    mv *.h $out/include/
+  '';
+
+  meta = {
+    description = "Http multipart parser implemented in C ";
+    homepage = https://github.com/iafonov/multipart-parser-c;
+    license = [ stdenv.lib.licenses.mit ];
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
index 01214878cd8b..54bf1cc442b9 100644
--- a/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/rivet/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    sha256 = "12mlj2j1glidjhiaxlr25qz2vfb865wip1vwwg8vlyd3yzisf533";
+    sha256 = "1bxcb99a3l5d2gl93zgfzgw6v95kx1ss5045mkz3ciyw8w5nmb9l";
   };
 
   patches = [
diff --git a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
index 6e4ffb9745d0..7a89d61753d1 100644
--- a/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
+++ b/nixpkgs/pkgs/development/libraries/physics/yoda/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/yoda/YODA-${version}.tar.bz2";
-    sha256 = "0fl9y1mh48xkjmqc76rfhvr3vs4v4lzybh06bwxyflzy82ylwi71";
+    sha256 = "0w9s3qv87hrmpq4dkrxcrl2hn2vcsbvy8ml99w85404wksw1dwrx";
   };
 
   pythonPath = []; # python wrapper support
diff --git a/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix b/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix
new file mode 100644
index 000000000000..23c8257ac8fe
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/prometheus-cpp/default.nix
@@ -0,0 +1,41 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+, gbenchmark
+, gtest
+, civetweb
+, zlib
+, curl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "prometheus-cpp";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "jupp0r";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "sha256:1a0gpfmk0z9wgsbzvx823aqbs7w836l0j0rnsxl9ifwgdxnxbl6m";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ gbenchmark civetweb gtest zlib curl ];
+
+  strictDeps = true;
+
+  cmakeFlags = [
+    "-DUSE_THIRDPARTY_LIBRARIES=OFF"
+    "-DCIVETWEB_INCLUDE_DIR=${civetweb.dev}/include"
+    "-DCIVETWEB_CXX_LIBRARY=${civetweb}/lib/libcivetweb${stdenv.targetPlatform.extensions.sharedLibrary}"
+  ];
+
+  NIX_LDFLAGS = [ "-ldl" ];
+
+  meta = {
+    description = "Prometheus Client Library for Modern C++";
+    homepage = https://github.com/jupp0r/prometheus-cpp;
+    license = [ stdenv.lib.licenses.mit ];
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/libraries/protozero/default.nix b/nixpkgs/pkgs/development/libraries/protozero/default.nix
index 74e040e94ab0..a18d768c288c 100644
--- a/nixpkgs/pkgs/development/libraries/protozero/default.nix
+++ b/nixpkgs/pkgs/development/libraries/protozero/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "protozero-${version}";
-  version = "1.6.4";
+  version = "1.6.7";
 
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "protozero";
     rev = "v${version}";
-    sha256 = "0hcawgyj3wxqikx5xqs1ag12w8vz00gb1rzx131jq51yhzc6bwrb";
+    sha256 = "1ryvn3iwxiaih3mvyy45nbwxnhzfc8vby0xh9m6d6fpakhcpf6s3";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/nixpkgs/pkgs/development/libraries/python-qt/default.nix b/nixpkgs/pkgs/development/libraries/python-qt/default.nix
index e1f2596f87c1..4b5b7ace074b 100644
--- a/nixpkgs/pkgs/development/libraries/python-qt/default.nix
+++ b/nixpkgs/pkgs/development/libraries/python-qt/default.nix
@@ -28,8 +28,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/include/PythonQt
     cp -r ./lib $out
     cp -r ./src/* $out/include/PythonQt
-    cp extensions/PythonQt_QtAll/PythonQt_QtAll.h $out/include/PythonQt
-    cp extensions/PythonQt_QtAll/PythonQt_QtAll.cpp $out/include/PythonQt
+    cp -r ./build $out/include/PythonQt
+    cp -r ./extensions $out/include/PythonQt
   '';
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
index c7773baad0c4..bc6432b5ca5a 100644
--- a/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -60,7 +60,10 @@ let
     qtdeclarative = [ ./qtdeclarative.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
-    qtwebengine = [ ./qtwebengine-no-build-skip.patch ];
+    qtwebengine = [
+      ./qtwebengine-no-build-skip.patch
+      ./qtwebengine-CVE-2019-5786.patch
+    ];
     qtwebkit = [ ./qtwebkit.patch ]
       ++ optionals stdenv.isDarwin [
         ./qtwebkit-darwin-no-readline.patch
diff --git a/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
new file mode 100644
index 000000000000..ec9a432ea708
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/qt-5/5.12/qtwebengine-CVE-2019-5786.patch
@@ -0,0 +1,26 @@
+--- a/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
++++ b/src/3rdparty/chromium/third_party/blink/renderer/core/fileapi/file_reader_loader.cc
+@@ -135,14 +135,16 @@
+   if (!raw_data_ || error_code_)
+     return nullptr;
+ 
+-  DOMArrayBuffer* result = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
+-  if (finished_loading_) {
+-    array_buffer_result_ = result;
+-    AdjustReportedMemoryUsageToV8(
+-        -1 * static_cast<int64_t>(raw_data_->ByteLength()));
+-    raw_data_.reset();
++  if (!finished_loading_) {
++    return DOMArrayBuffer::Create(
++        ArrayBuffer::Create(raw_data_->Data(), raw_data_->ByteLength()));
+   }
+-  return result;
++  array_buffer_result_ = DOMArrayBuffer::Create(raw_data_->ToArrayBuffer());
++  AdjustReportedMemoryUsageToV8(-1 *
++                                static_cast<int64_t>(raw_data_->ByteLength()));
++
++  raw_data_.reset();
++  return array_buffer_result_;
+ }
+ 
+ String FileReaderLoader::StringResult() {
diff --git a/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix b/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix
index e1155c4a3bcb..07209be0dce0 100644
--- a/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/nixpkgs/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   buildInputs = [ qtwebkit hunspell ];
 
   postPatch = ''
-    sed -i "s,-lhunspell,-lhunspell-1.6," src/spellcheck/spellcheck.pri
+    sed -i "s,-lhunspell,-lhunspell-${stdenv.lib.versions.majorMinor hunspell.version}," src/spellcheck/spellcheck.pri
     sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro
   '';
 
diff --git a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
index 65569b9f3bdb..3eee63dbf4f6 100644
--- a/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
+++ b/nixpkgs/pkgs/development/libraries/science/math/primesieve/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "primesieve-${version}";
-  version = "7.3";
+  version = "7.4";
 
   nativeBuildInputs = [cmake];
 
   src = fetchurl {
     url = "https://github.com/kimwalisch/primesieve/archive/v${version}.tar.gz";
-    sha256 = "0l7h5r4c7hijh0c0nsdxvjqzc9dbhlx535b87fglf2i2p9la1x5v";
+    sha256 = "16930d021ai8cl3gsnn2v6l30n6mklwwqd53z51cddd3dj69x6zz";
   };
 
   meta = with stdenv.lib; {
diff --git a/nixpkgs/pkgs/development/libraries/shapelib/default.nix b/nixpkgs/pkgs/development/libraries/shapelib/default.nix
index 09d3efa64b2b..9da54a370425 100644
--- a/nixpkgs/pkgs/development/libraries/shapelib/default.nix
+++ b/nixpkgs/pkgs/development/libraries/shapelib/default.nix
@@ -1,15 +1,13 @@
-{ stdenv, fetchurl, proj }:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "shapelib-1.4.1";
+  name = "shapelib-1.5.0";
 
   src = fetchurl {
     url = "https://download.osgeo.org/shapelib/${name}.tar.gz";
-    sha256 = "1cr3b5jfglwisbyzj7fnxp9xysqad0fcmcqvqaja6qap6qblijd4";
+    sha256 = "1qfsgb8b3yiqwvr6h9m81g6k9fjhfys70c22p7kzkbick20a9h0z";
   };
 
-  buildInputs =  [ proj ];
-
   meta = with stdenv.lib; {
     description = "C Library for reading, writing and updating ESRI Shapefiles";
     homepage = http://shapelib.maptools.org/;
diff --git a/nixpkgs/pkgs/development/libraries/thrift/default.nix b/nixpkgs/pkgs/development/libraries/thrift/default.nix
index dee441a0c2f6..92cc76273ba1 100644
--- a/nixpkgs/pkgs/development/libraries/thrift/default.nix
+++ b/nixpkgs/pkgs/development/libraries/thrift/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "thrift-${version}";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchurl {
     url = "https://archive.apache.org/dist/thrift/${version}/${name}.tar.gz";
-    sha256 = "1hk0zb9289gf920rdl0clmwqx6kvygz92nj01lqrhd2arfv3ibf4";
+    sha256 = "0a04v7dgm1qzgii7v0sisnljhxc9xpq2vxkka60scrdp6aahjdn3";
   };
 
   #enableParallelBuilding = true; problems on hydra
diff --git a/nixpkgs/pkgs/development/libraries/ticpp/default.nix b/nixpkgs/pkgs/development/libraries/ticpp/default.nix
new file mode 100644
index 000000000000..e46bf2418bcf
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/ticpp/default.nix
@@ -0,0 +1,35 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation {
+  pname = "ticpp";
+  version = "unstable-2019-01-09";
+
+  src = fetchFromGitHub {
+    owner = "wxFormBuilder";
+    repo = "ticpp";
+    rev = "eb79120ea16b847ce9f483a298a394050f463d6b";
+    sha256 = "sha256:0xk4cy0xbkr6326cqd1vd6b2x0rfsx4iz2sq8f5jz3yl3slxgjm2";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  cmakeFlags = [ "-DBUILD_TICPP_DLL=1" ];
+
+  installPhase = ''
+    cd ..
+    mkdir -p $out/lib
+    install build/*.{a,so} $out/lib
+    mkdir -p $out/include
+    install *.h $out/include
+  '';
+
+  meta = {
+    description = "Interface to TinyXML";
+    license = stdenv.lib.licenses.mit;
+    homepage = https://github.com/wxFormBuilder/ticpp;
+  };
+
+}
diff --git a/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix b/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix
index fe84217d9432..dd8a300d70f4 100644
--- a/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix
+++ b/nixpkgs/pkgs/development/libraries/totem-pl-parser/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "totem-pl-parser";
-  version = "3.26.2";
+  version = "3.26.3";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0fhwhrq5p0a8arh3lzk5bfjlkip3rlna9r6ybpi9fid4cpwsr1nk";
+    sha256 = "13a45py2j1r9967zgww8kd24bn2fhycd4m3kzr90sxx9l2w03z8f";
   };
 
   passthru = {
diff --git a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index 27f0c4ea0b5b..1bec00e55596 100644
--- a/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
+++ b/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
@@ -2,7 +2,7 @@
 , pkgconfig, gettext, gobject-introspection, libnotify, gnutls, libgcrypt
 , gtk3, wayland, libwebp, enchant2, xorg, libxkbcommon, epoxy, at-spi2-core
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11-kit
-, libidn, libedit, readline, libGLU_combined, libintl
+, libidn, libedit, readline, libGLU_combined, libintl, openjpeg
 , enableGeoLocation ? true, geoclue2, sqlite
 , enableGtk2Plugins ? false, gtk2 ? null
 , gst-plugins-base, gst-plugins-bad, woff2
@@ -15,7 +15,7 @@ assert stdenv.isDarwin -> !enableGtk2Plugins;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.22.7";
+  version = "2.24.0";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "1zrhmz90sn30zgyflj4i86fsscws10xsi2kfs87nj2nd0pbggrjb";
+    sha256 = "01s446lmjk7y8il4snjm32vpxws2rp4hmxrwm2swx0p47x8d2jif";
   };
 
   patches = optionals stdenv.isDarwin [
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     libintl libwebp enchant2 libnotify gnutls pcre nettle libidn libgcrypt woff2
-    libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit
+    libxml2 libsecret libxslt harfbuzz libpthreadstubs libtasn1 p11-kit openjpeg
     sqlite gst-plugins-base gst-plugins-bad libxkbcommon epoxy at-spi2-core
   ] ++ optional enableGeoLocation geoclue2
     ++ optional enableGtk2Plugins gtk2
diff --git a/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
index b6aca6f8216c..d3b2d78bf0a6 100644
--- a/nixpkgs/pkgs/development/libraries/wlroots/default.nix
+++ b/nixpkgs/pkgs/development/libraries/wlroots/default.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "wlroots";
-  version = "0.4.1";
+  version = "0.5.0";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     owner = "swaywm";
     repo = "wlroots";
     rev = version;
-    sha256 = "1624gasx8k0yy649d65ih4hs290szyxzd3bl0kg1l6njnhlxnr6b";
+    sha256 = "1phiidyddzgaxy4gbqwmykxn0y8za6y5mp66l9dpd9i6fml153yq";
   };
 
   # $out for the library, $bin for rootston, and $examples for the example
diff --git a/nixpkgs/pkgs/development/libraries/xapian/default.nix b/nixpkgs/pkgs/development/libraries/xapian/default.nix
index 76c345c6b7e9..c10dfdaa961c 100644
--- a/nixpkgs/pkgs/development/libraries/xapian/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xapian/default.nix
@@ -38,5 +38,5 @@ let
 in {
   # xapian-ruby needs 1.2.22 as of 2017-05-06
   xapian_1_2_22 = generic "1.2.22" "0zsji22n0s7cdnbgj0kpil05a6bgm5cfv0mvx12d8ydg7z58g6r6";
-  xapian_1_4 = generic "1.4.10" "1f4vf1w1yvsn9mn462q6snc8wkmfpifp8wrlzs4aqi45w0kr6rk8";
+  xapian_1_4 = generic "1.4.11" "01xwqljnp5afjf9097lyfbqc6x5bcqszfdkn9l1j86imwbrv45lz";
 }
diff --git a/nixpkgs/pkgs/development/libraries/xxHash/default.nix b/nixpkgs/pkgs/development/libraries/xxHash/default.nix
index 51f883a020be..9f2b83d7597c 100644
--- a/nixpkgs/pkgs/development/libraries/xxHash/default.nix
+++ b/nixpkgs/pkgs/development/libraries/xxHash/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xxHash-${version}";
-  version = "0.6.5";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "Cyan4973";
     repo = "xxHash";
     rev = "v${version}";
-    sha256 = "137hifc3f3cb4ib64rd6y83arc9hmbyncgrij2v8m94mx66g2aks";
+    sha256 = "19iyr7x0s7in9kp9wrj4iimdx58nv6jndz9x5ndnl07gd90y7jxb";
   };
 
   outputs = [ "out" "dev" ];
@@ -26,6 +26,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = https://github.com/Cyan4973/xxHash;
     license = with licenses; [ bsd2 gpl2 ];
+    maintainers = with maintainers; [ orivej ];
     platforms = platforms.unix;
   };
 }