Merge branch 'staging-next' into staging

Commits from master, conflict resolutions, etc.

pkgs/development/libraries/sqlite/analyzer.nix

@@ -24,6 +24,7 @@ stdenv.mkDerivation rec {
     description = "A tool that shows statistics about SQLite databases";
     downloadPage = http://sqlite.org/download.html;
     homepage = http://www.sqlite.org;
+    license = licenses.publicDomain;
     maintainers = with maintainers; [ pesterhazy ];
     platforms = platforms.unix;
   };

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;
   };

pkgs/development/libraries/sqlite/sqlar.nix

@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://sqlite.org/sqlar;
     description = "SQLite Archive utilities";
+    license = licenses.bsd2;
     platforms = platforms.all;
     maintainers = with maintainers; [ dtzWill ];
   };