diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-09-08 18:24:58 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-09-08 18:24:58 +0200 |
commit | 82797f98f2917e164db8691b516ed7f354b40ff4 (patch) | |
tree | 4f901da1992cb81e6dd1a259c3c1087afe710699 /pkgs/servers/shishi/default.nix | |
parent | 1e389c976cc5326b08bd166785e643364bb2d8b4 (diff) | |
parent | 152ae27aac2a78acee996eb035ef2b40e58bbf9d (diff) |
Merge branch 'staging' into modular-stdenv
Conflicts: pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/stdenv/linux/default.nix
Diffstat (limited to 'pkgs/servers/shishi/default.nix')
-rw-r--r-- | pkgs/servers/shishi/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 2e0a4e84f6c7f..a41915e5be8ae 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Shishi, free implementation of the Kerberos 5 network security system"; + description = "An implementation of the Kerberos 5 network security system"; homepage = http://www.gnu.org/software/shishi/; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ bjg lovek323 ]; |