Merge branch 'master.upstream' into staging.upstream

pkgs/development/libraries/libpsl/default.nix

@@ -5,21 +5,21 @@ let
 
   version = "${libVersion}-list-${listVersion}";
 
-  listVersion = "2015-09-15";
+  listVersion = "2015-09-25";
   listSources = fetchFromGitHub {
-    sha256 = "1rrds3bsnxb2n2ifl0zg6mh1h8nd3h1ba4bz0dznrrlqzfbav0l2";
-    rev = "4f89204a24e99d8a65353cc62d5bc4dea1b2ae31";
+    sha256 = "045snl0pz8ma5rk51xxbjcamm28hi4z2v7gd8zkkv8yrjyg9yp82";
+    rev = "509db00ef21795e58bfc2c576cebf72c8ee7a6f9";
     repo = "list";
     owner = "publicsuffix";
   };
 
-  libVersion = "0.10.0";
+  libVersion = "0.11.0";
 
 in stdenv.mkDerivation {
   name = "libpsl-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0m6jz0cc49cp0zki1qb2b1z7z0djladayfhbxi0i20pad28czsbn";
+    sha256 = "08k7prrr83lg6jmm5r5k4alpm2in4qlnx49ypb4bxv16lq8dcnmm";
     rev = "libpsl-${libVersion}";
     repo = "libpsl";
     owner = "rockdaboot";