Merge branch 'staging' into closure-size

pkgs/development/libraries/libxml2/default.nix

@@ -1,16 +1,12 @@
 { stdenv, fetchurl, zlib, xz, python, findXMLCatalogs }:
 
-let
-  version = "2.9.2";
-  inherit (stdenv.lib) optional;
-in
-
 stdenv.mkDerivation rec {
   name = "libxml2-${version}";
+  version = "2.9.3";
 
   src = fetchurl {
     url = "http://xmlsoft.org/sources/${name}.tar.gz";
-    sha256 = "1g6mf03xcabmk5ing1lwqmasr803616gb2xhn7pll10x2l5w6y2i";
+    sha256 = "0bd17g6znn2r98gzpjppsqjg33iraky4px923j3k8kdl8qgy7sad";
   };
 
   outputs = [ "dev" "out" "bin" "doc" "py" ];
@@ -20,7 +16,7 @@ stdenv.mkDerivation rec {
     # Libxml2 has an optional dependency on liblzma.  However, on impure
     # platforms, it may end up using that from /usr/lib, and thus lack a
     # RUNPATH for that, leading to undefined references for its users.
-    ++ optional stdenv.isFreeBSD xz;
+    ++ stdenv.lib.optional stdenv.isFreeBSD xz;
 
   propagatedBuildInputs = [ zlib findXMLCatalogs ];
 
@@ -47,4 +43,3 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
-