Merge remote-tracking branch 'nixpkgs/nixos-unstable-small'

Conflicts:
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/pkgs/build-support/go/module.nix

4 files changed, 33 insertions, 5 deletions

diff --git a/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix b/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix
index 8ba0803d96bc..72eb5c153a48 100644
--- a/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix
+++ b/nixpkgs/pkgs/by-name/pg/pgagroal/package.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://agroal.github.io/pgagroal/";
     changelog = "https://github.com/agroal/pgagroal/releases/tag/${finalAttrs.version}";
     license = licenses.bsd3;
-    maintainers = [ maintainers.marsam ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 })
diff --git a/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix b/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix
index b65d5ca77b09..cc415c4d8a9d 100644
--- a/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix
+++ b/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/dimitri/pgcopydb";
     changelog = "https://github.com/dimitri/pgcopydb/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = licenses.postgresql;
-    maintainers = with maintainers; [ marsam ];
+    maintainers = with maintainers; [ ];
     mainProgram = "pgcopydb";
     platforms = platforms.all;
   };
diff --git a/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix b/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix
index c56243fe8920..535eff92fb22 100644
--- a/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix
+++ b/nixpkgs/pkgs/by-name/pg/pgmoneta/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pgmoneta";
-  version = "0.10.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "pgmoneta";
     repo = "pgmoneta";
     rev = version;
-    hash = "sha256-wNBomyyr078Twzg7fuu3et1NUxpb+vqIbsnpmF73t18=";
+    hash = "sha256-+2pS3KG5wwP7bnaV+x8WxvDvQuXqmiMbuLScMNLqBtI=";
   };
 
   nativeBuildInputs = [
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     homepage = "https://pgmoneta.github.io/";
     changelog = "https://github.com/pgmoneta/pgmoneta/releases/tag/${version}";
     license = licenses.bsd3;
-    maintainers = [ maintainers.marsam ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/nixpkgs/pkgs/by-name/pg/pgroll/package.nix b/nixpkgs/pkgs/by-name/pg/pgroll/package.nix
new file mode 100644
index 000000000000..d3670ef96d13
--- /dev/null
+++ b/nixpkgs/pkgs/by-name/pg/pgroll/package.nix
@@ -0,0 +1,28 @@
+{ buildGoModule
+, fetchFromGitHub
+, lib
+}:
+
+buildGoModule rec {
+  pname = "pgroll";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "xataio";
+    repo = "pgroll";
+    rev = "v${version}";
+    hash = "sha256-VYGwIJsPVilFxvglj+E7H9NpqUV1CV/ggBP3gFleWIA=";
+  };
+
+  vendorHash = "sha256-Fz+o1jSoMfqKYo1I7VUFqbhBEgcoQEx7aYsmzCLsbnI=";
+
+  # Tests require a running docker daemon
+  doCheck = false;
+
+  meta = with lib; {
+    description = "PostgreSQL zero-downtime migrations made easy";
+    license = licenses.asl20;
+    homepage = "https://github.com/xataio/pgroll";
+    maintainers = with maintainers; [ ilyakooo0 ];
+  };
+}