From 1e7997bdd2a5dba6a579912cb27ef9461e75e695 Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Mon, 24 Sep 2018 14:32:54 +0200
Subject: [PATCH 1/2] roundcube: init at 1.3.7
---
maintainers/maintainer-list.nix | 5 +++++
pkgs/servers/roundcube/default.nix | 26 ++++++++++++++++++++++++++
pkgs/top-level/all-packages.nix | 2 ++
3 files changed, 33 insertions(+)
create mode 100644 pkgs/servers/roundcube/default.nix
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 726cbd74313..975aee445e2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4421,6 +4421,11 @@
github = "vrthra";
name = "Rahul Gopinath";
};
+ vskilet = {
+ email = "victor@sene.ovh";
+ github = "vskilet";
+ name = "Victor SENE";
+ };
vyp = {
email = "elisp.vim@gmail.com";
github = "vyp";
diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
new file mode 100644
index 00000000000..961bdd3c00e
--- /dev/null
+++ b/pkgs/servers/roundcube/default.nix
@@ -0,0 +1,26 @@
+{ lib, stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+ name= "roundcube-${version}";
+ version = "1.3.7";
+
+ src = fetchurl {
+ url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
+ sha256 = "31bd37d0f89dc634064f170c6ed8981c258754b6f81eccb59a2634b29d0bb01c";
+ };
+
+ installPhase = ''
+ mkdir -p $out/
+ cp -R . $out/
+ ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php
+ rm -rf $out/installer
+ '';
+
+ meta = {
+ description = "Open Source Webmail Software";
+ maintainers = with stdenv.lib.maintainers; [ vskilet ];
+ license = stdenv.lib.licenses.gpl3;
+ platforms = stdenv.lib.platforms.all;
+ };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da1a81bdb08..1fb0215ac94 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1532,6 +1532,8 @@ with pkgs;
riot-web = callPackage ../applications/networking/instant-messengers/riot/riot-web.nix {
conf = config.riot-web.conf or null;
};
+
+ roundcube = callPackage ../servers/roundcube { };
rsbep = callPackage ../tools/backup/rsbep { };
From e387f2506ba402b6c03150485a85b144b03af638 Mon Sep 17 00:00:00 2001
From: Victor SENE <victor@sene.ovh>
Date: Wed, 26 Sep 2018 15:34:46 +0200
Subject: [PATCH 2/2] roundcube: simplify using fetchzip
---
pkgs/servers/roundcube/default.nix | 21 +++++++++------------
1 file changed, 9 insertions(+), 12 deletions(-)
diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix
index 961bdd3c00e..40afd7043e4 100644
--- a/pkgs/servers/roundcube/default.nix
+++ b/pkgs/servers/roundcube/default.nix
@@ -1,17 +1,14 @@
-{ lib, stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
- name= "roundcube-${version}";
+{ lib, stdenv, fetchzip }:
+let
version = "1.3.7";
+in
+fetchzip rec {
+ name= "roundcube-${version}";
- src = fetchurl {
- url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
- sha256 = "31bd37d0f89dc634064f170c6ed8981c258754b6f81eccb59a2634b29d0bb01c";
- };
-
- installPhase = ''
- mkdir -p $out/
- cp -R . $out/
+ url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz";
+ sha256 = "0xwqy0adynx7066a0cvz9vyg85waax1i4p70kcdkz7q5jnw4jzhf";
+
+ extraPostFetch = ''
ln -sf /etc/roundcube/config.inc.php $out/config/config.inc.php
rm -rf $out/installer
'';