Merge staging-next into staging

2018-11-18 10:41:34 +01:00
parent 0a085d508a 3aa6b8ccc5
commit 0d0d7dcd06
422 changed files with 65253 additions and 65218 deletions
--- a/pkgs/servers/sql/postgresql/pgtap/default.nix
+++ b/pkgs/servers/sql/postgresql/pgtap/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
    maintainers = with maintainers; [ willibutz ];
    homepage = https://pgtap.org;
    inherit (postgresql.meta) platforms;
+    license = licenses.mit;
  };
 }