From 9fb09a6e141782d1f1d850169105bf06cd29e7cc Mon Sep 17 00:00:00 2001
From: Daniel Frank <git@danielfrank.net>
Date: Fri, 9 Jun 2023 20:58:41 +0200
Subject: [PATCH] update roundcube and remove old files

---
 nix/sources.json     |  2 +-
 pkg-postfixadmin.nix | 35 -----------------------------------
 pkg-roundcube.nix    | 33 ---------------------------------
 3 files changed, 1 insertion(+), 69 deletions(-)
 delete mode 100644 pkg-postfixadmin.nix
 delete mode 100644 pkg-roundcube.nix

diff --git a/nix/sources.json b/nix/sources.json
index fba7ada..9eacf1d 100644
--- a/nix/sources.json
+++ b/nix/sources.json
@@ -2,7 +2,7 @@
     "nixos-mailserver": {
         "branch": "main",
         "repo": "https://codeberg.org/tokudan/nixos-mailserver.git",
-        "rev": "7f2ea27801c4cbfcf46292911b5959528b4eed49",
+        "rev": "ad368983114299608ce02e69043caa9e1ab53df6",
         "type": "git"
     }
 }
diff --git a/pkg-postfixadmin.nix b/pkg-postfixadmin.nix
deleted file mode 100644
index 83f1a49..0000000
--- a/pkg-postfixadmin.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, lib, fetchFromGitHub, config ? null, cacheDir ? null }:
-
-stdenv.mkDerivation rec {
-  name = "postfixadmin-${version}";
-  version = "3.3.8";
-  rev = "${name}";
-
-  src = fetchFromGitHub {
-    inherit rev;
-    owner = "postfixadmin";
-    repo = "postfixadmin";
-    sha256 = "02qnan2yk74i5z8z919zc0ris4ixpqwzl93kjga6db57nki7lwx9";
-  };
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    cp -Rp ./ $out/
-    ${lib.optionalString (config != null) ''
-      ln -s ${config} $out/config.local.php
-    ''}
-    ${lib.optionalString (cacheDir != null) ''
-      ln -s ${cacheDir}/templates_c $out/templates_c
-    ''}
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Postfix Admin";
-    homepage    = http://postfixadmin.sourceforge.net/;
-    license     = licenses.gpl2;
-    maintainers = with maintainers; [ tokudan ];
-    platforms   = platforms.all;
-  };
-}
-
diff --git a/pkg-roundcube.nix b/pkg-roundcube.nix
deleted file mode 100644
index ecded44..0000000
--- a/pkg-roundcube.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, lib, fetchurl, acl, librsync, ncurses, openssl, zlib, conf ? null, temp ? null, logs ? null }:
-
-stdenv.mkDerivation rec {
-  name = "roundcube-${version}";
-  version = "1.4.11";
-  url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
-
-  src = fetchurl {
-    inherit url;
-    curlOpts = "--location";
-    sha256 = "1dv9bvq1q2dlrlqykvibfcq70q6qc9an08vpik4c4prh1h3ijwxc";
-  };
-  preferLocalBuild = true;
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  installPhase = ''
-    cp -Rp ./ $out/
-    cd "$out"
-    ${lib.optionalString (conf != null) "ln -s ${conf} $out/config/config.inc.php"}
-    ${lib.optionalString (temp != null) "mv temp temp.dist; ln -s ${temp} $out/temp"}
-    ${lib.optionalString (logs != null) "mv logs logs.dist; ln -s ${logs} $out/logs"}
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Roundcube";
-    homepage    = https://roundcube.net/;
-    license     = licenses.agpl3;
-    maintainers = with maintainers; [ tokudan ];
-    platforms   = platforms.all;
-  };
-}
-