7 files changed, 5 insertions, 231 deletions
diff --git a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix b/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix
deleted file mode 100644
index 99e482323a46..000000000000
--- a/nixpkgs/pkgs/servers/mail/archiveopteryx/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ lib, stdenv, fetchurl, openssl, perl, zlib, jam }:
-stdenv.mkDerivation rec {
-  version = "3.2.0";
-  pname = "archiveopteryx";
-
-  src = fetchurl {
-    url = "http://archiveopteryx.org/download/${pname}-${version}.tar.bz2";
-    sha256 = "0i0zg8di8nbh96qnyyr156ikwcsq1w9b2291bazm5whb351flmqx";
-  };
-
-  nativeBuildInputs = [ jam ];
-  buildInputs = [ openssl perl zlib ];
-
-  preConfigure = ''
-    export INSTALLROOT=installroot
-    sed -i 's:BINDIR = $(PREFIX)/bin:BINDIR = '$out'/bin:' ./Jamsettings
-    sed -i 's:SBINDIR = $(PREFIX)/sbin:SBINDIR = '$out'/bin:' ./Jamsettings
-    sed -i 's:LIBDIR = $(PREFIX)/lib:LIBDIR = '$out'/lib:' ./Jamsettings
-    sed -i 's:MANDIR = $(PREFIX)/man:MANDIR = '$out'/share/man:' ./Jamsettings
-    sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings
-  '';
-
-  # fix build on gcc7+ and gcc11+
-  env.NIX_CFLAGS_COMPILE = toString ([
-    "-std=c++11" # c++17+ has errors
-    "-Wno-error=builtin-declaration-mismatch"
-    "-Wno-error=deprecated-copy"
-    "-Wno-error=implicit-fallthrough"
-    "-Wno-error=nonnull"
-  ] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
-    "-Wno-error=mismatched-new-delete"
-  ]);
-
-  buildPhase = ''jam "-j$NIX_BUILD_CORES" '';
-  installPhase = ''
-    jam install
-    mv installroot/$out $out
-  '';
-
-  meta = with lib; {
-    homepage = "http://archiveopteryx.org/";
-    description = "An advanced PostgreSQL-based IMAP/POP server";
-    license = licenses.postgresql;
-    maintainers = [ maintainers.phunehehe ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix b/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
index f330fd7c6cf3..59c306beedd9 100644
--- a/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
+++ b/nixpkgs/pkgs/servers/mail/dovecot/plugins/fts_xapian/default.nix
@@ -1,13 +1,13 @@
 { lib, stdenv, fetchFromGitHub, autoconf, automake, sqlite, pkg-config, dovecot, libtool, xapian, icu64 }:
 stdenv.mkDerivation rec {
   pname = "dovecot-fts-xapian";
-  version = "1.6.5";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "grosjo";
     repo = "fts-xapian";
     rev = version;
-    sha256 = "sha256-jkQM5J3Yqjo2j4kXhw/woV0kID2bghCmpFMuxbdMHuk=";
+    sha256 = "sha256-Jc8rk/g+dzCpSWsn/Rt5qjhDr5nxO9wmi7rgfyyTSTU=";
   };
 
   buildInputs = [ dovecot xapian icu64 sqlite ];
diff --git a/nixpkgs/pkgs/servers/mail/listmonk/default.nix b/nixpkgs/pkgs/servers/mail/listmonk/default.nix
deleted file mode 100644
index 24f97afa348d..000000000000
--- a/nixpkgs/pkgs/servers/mail/listmonk/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub, callPackage, stuffbin, nixosTests, fetchpatch }:
-
-buildGoModule rec {
-  pname = "listmonk";
-  version = "2.5.1";
-
-  src = fetchFromGitHub {
-    owner = "knadh";
-    repo = "listmonk";
-    rev = "v${version}";
-    sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I=";
-  };
-
-  patches = [
-    # Ensure that listmonk supports Go 1.20
-    (fetchpatch {
-      url = "https://github.com/knadh/listmonk/commit/25513b81044803b104ada63c0be57a913960484e.patch";
-      hash = "sha256-SYACM8r+NgeSWn9VJV4+wkm+6s/MhNGwn5zyc2tw7FU=";
-    })
-  ];
-
-  vendorHash = "sha256-0sgC1+ueZTUCP+7JwI/OKLktfMHQq959GEk1mC0TQgE=";
-
-  nativeBuildInputs = [
-    stuffbin
-  ];
-
-  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
-
-  postInstall = ''
-    mv $out/bin/cmd $out/bin/listmonk
-  '';
-
-  # Run stuffbin to stuff the frontend and the static in the binary.
-  postFixup =
-    let
-      vfsMappings = [
-        "config.toml.sample"
-        "schema.sql"
-        "queries.sql"
-        "static/public:/public"
-        "static/email-templates"
-        "${passthru.frontend}:/admin"
-        "i18n:/i18n"
-      ];
-    in
-      ''
-        stuffbin -a stuff -in $out/bin/listmonk -out $out/bin/listmonk \
-          ${lib.concatStringsSep " " vfsMappings}
-      '';
-
-  passthru = {
-    frontend = callPackage ./frontend.nix { inherit meta; };
-    tests = { inherit (nixosTests) listmonk; };
-  };
-
-  meta = with lib; {
-    description = "High performance, self-hosted, newsletter and mailing list manager with a modern dashboard.";
-    homepage = "https://github.com/knadh/listmonk";
-    changelog = "https://github.com/knadh/listmonk/releases/tag/v${version}";
-    maintainers = with maintainers; [ raitobezarius ];
-    license = licenses.agpl3;
-  };
-}
diff --git a/nixpkgs/pkgs/servers/mail/listmonk/frontend.nix b/nixpkgs/pkgs/servers/mail/listmonk/frontend.nix
deleted file mode 100644
index 647f5cfd9f6a..000000000000
--- a/nixpkgs/pkgs/servers/mail/listmonk/frontend.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ yarn2nix-moretea
-, fetchFromGitHub
-, fetchYarnDeps
-, meta
-}:
-
-yarn2nix-moretea.mkYarnPackage rec {
-  pname = "listmonk-frontend";
-  version = "2.5.1";
-
-  src = fetchFromGitHub {
-    owner = "knadh";
-    repo = "listmonk";
-    rev = "v${version}";
-    sha256 = "sha256-gCnIblc83CmG1auvYYxqW/xBl6Oy1KHGkqSY/3yIm3I=";
-  };
-
-  packageJSON = ./package.json;
-  yarnLock = "${src}/frontend/yarn.lock";
-
-  offlineCache = fetchYarnDeps {
-    inherit yarnLock;
-    hash = "sha256-KKNk4lrM7unMFClkY6F3nqhKx5xfx87Ac+rug9sOwvI=";
-  };
-
-  # For Node.js v17+, this is necessary.
-  NODE_OPTIONS = "--openssl-legacy-provider";
-
-  installPhase = ''
-    runHook preInstall
-
-    cd deps/listmonk-frontend/frontend
-    npm run build
-
-    mv dist $out
-
-    runHook postInstall
-  '';
-
-  doDist = false;
-
-
-  inherit meta;
-}
diff --git a/nixpkgs/pkgs/servers/mail/listmonk/package.json b/nixpkgs/pkgs/servers/mail/listmonk/package.json
deleted file mode 100644
index 6e981fefc8b3..000000000000
--- a/nixpkgs/pkgs/servers/mail/listmonk/package.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "name": "listmonk-frontend",
-  "version": "0.1.0",
-  "private": true,
-  "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "build-report": "vue-cli-service build --report",
-    "lint": "vue-cli-service lint"
-  },
-  "dependencies": {
-    "@tinymce/tinymce-vue": "^3",
-    "axios": "^0.27.2",
-    "buefy": "^0.9.10",
-    "c3": "^0.7.20",
-    "codeflask": "^1.4.1",
-    "core-js": "^3.12.1",
-    "dayjs": "^1.10.4",
-    "indent.js": "^0.3.5",
-    "qs": "^6.10.1",
-    "textversionjs": "^1.1.3",
-    "tinymce": "^5.10.7",
-    "turndown": "^7.0.0",
-    "vue": "^2.6.12",
-    "vue-i18n": "^8.22.2",
-    "vue-router": "^3.2.0",
-    "vuex": "^3.6.2"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-eslint": "~5.0.8",
-    "@vue/cli-plugin-router": "~5.0.8",
-    "@vue/cli-plugin-vuex": "~5.0.8",
-    "@vue/cli-service": "~5.0.8",
-    "@vue/eslint-config-airbnb": "^5.3.0",
-    "babel-eslint": "^10.1.0",
-    "cypress": "10.10.0",
-    "cypress-file-upload": "^5.0.2",
-    "eslint": "^7.27.0",
-    "eslint-plugin-import": "^2.23.3",
-    "eslint-plugin-vue": "^7.9.0",
-    "sass": "^1.34.0",
-    "sass-loader": "^10.2.0",
-    "vue-template-compiler": "^2.6.12"
-  }
-}
diff --git a/nixpkgs/pkgs/servers/mail/listmonk/stuffbin.nix b/nixpkgs/pkgs/servers/mail/listmonk/stuffbin.nix
deleted file mode 100644
index 2640ba8b8519..000000000000
--- a/nixpkgs/pkgs/servers/mail/listmonk/stuffbin.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ lib, buildGoModule, fetchFromGitHub }:
-
-buildGoModule rec {
-  pname = "stuffbin";
-  version = "1.1.0";
-
-  vendorHash = null;
-
-  src = fetchFromGitHub {
-    owner = "knadh";
-    repo = "stuffbin";
-    rev = "v${version}";
-    sha256 = "sha256-M72xNh7bKUMLzA+M8bJB++kJ5KCrkboQm1v8BasP3Yo=";
-  };
-
-  ldflags = [ "-s" "-w" "-X main.version=${version}" ];
-
-  meta = with lib; {
-    description = "Compress and embed static files and assets into Go binaries and access them with a virtual file system in production";
-    homepage = "https://github.com/knadh/stuffbin";
-    changelog = "https://github.com/knadh/stuffbin/releases/tag/v${version}";
-    maintainers = with maintainers; [ raitobezarius ];
-    license = licenses.mit;
-  };
-}
diff --git a/nixpkgs/pkgs/servers/mail/postfix/default.nix b/nixpkgs/pkgs/servers/mail/postfix/default.nix
index 61b69359d3c8..e40c30ff79fa 100644
--- a/nixpkgs/pkgs/servers/mail/postfix/default.nix
+++ b/nixpkgs/pkgs/servers/mail/postfix/default.nix
@@ -25,11 +25,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "postfix";
-  version = "3.8.5";
+  version = "3.8.6";
 
   src = fetchurl {
-    url = "https://de.postfix.org/ftpmirror/official/${pname}-${version}.tar.gz";
-    hash = "sha256-8+gnorLkEDWa0l0xNBlwQ0qwfjYTn5ou+TmBsOxWTIU=";
+    url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz";
+    hash = "sha256-S24XyCbMQ4zDAWqcClXqfnfGy6+6fdVyQdgbaQsOl3Q=";
   };
 
   nativeBuildInputs = [ makeWrapper m4 ];