Merge branch 'staging-next' into staging

Commits from master, conflict resolutions, etc.

pkgs/development/libraries/sqlite/default.nix

@@ -77,6 +77,7 @@ stdenv.mkDerivation rec {
     description = "A self-contained, serverless, zero-configuration, transactional SQL database engine";
     downloadPage = http://sqlite.org/download.html;
     homepage = http://www.sqlite.org/;
+    license = licenses.publicDomain;
     maintainers = with maintainers; [ eelco np ];
     platforms = platforms.unix;
   };