From 576a82d6c24a84d70da5ea7d70904206f5129e23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Sat, 23 Nov 2019 15:36:28 +0100 Subject: [PATCH] rainloop-standard: Fix pname and license (#73963) - Switched to pname - Fixed the double dash in pname - Changed license to unfree (they don't allow redistribution) Fixes #73956 --- pkgs/servers/rainloop/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/rainloop/default.nix b/pkgs/servers/rainloop/default.nix index b037524f67f..ff6cb8c98eb 100644 --- a/pkgs/servers/rainloop/default.nix +++ b/pkgs/servers/rainloop/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, unzip, dataPath ? "/etc/rainloop" }: let common = { edition, sha256 }: stdenv.mkDerivation (rec { - name = "rainloop-${edition}-${version}"; + pname = "rainloop${stdenv.lib.optionalString (edition != "") "-${edition}"}"; version = "1.13.0"; buildInputs = [ unzip ]; @@ -26,8 +26,8 @@ meta = with stdenv.lib; { description = "Simple, modern & fast web-based email client"; homepage = "https://www.rainloop.net"; - downloadPage = https://github.com/RainLoop/rainloop-webmail/releases; - license = licenses.agpl3; + downloadPage = "https://github.com/RainLoop/rainloop-webmail/releases"; + license = with licenses; if edition == "" then unfree else agpl3; platforms = platforms.all; maintainers = with maintainers; [ das_j ]; };