diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-03 13:27:40 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-03-03 13:27:40 +0000 |
| commit | fcad0b0a5a6563453d3793e010af8b11232f64ad (patch) | |
| tree | 44d0f27cc059d027bee6fcfc1518dd6da15f6754 /pkgs/servers | |
| parent | 9efba4b3b068ebae3bc0d47e4095ff4807a4d3a7 (diff) | |
| download | nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar.gz nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar.bz2 nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar.lz nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar.xz nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.tar.zst nixlib-fcad0b0a5a6563453d3793e010af8b11232f64ad.zip | |
* Cleaned up a lot of description fields that contained newlines.
Some of these should be longDescriptions, but most others just
shouldn't contain newlines. E.g. write
description = "Bla";
and not
description = ''
Bla
'';
This pollutes "nix-env -qa --description" output.
svn path=/nixpkgs/trunk/; revision=14310
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/dict/1.9.15.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/dict/dictd-db.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/irc/ircd-hybrid/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/servers/xmpp/openfire/3.4.5.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/xmpp/openfire/3.5.2.nix | 6 |
5 files changed, 10 insertions, 20 deletions
diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix index 2886bb24ae9b..9eb0fe3dff9d 100644 --- a/pkgs/servers/dict/1.9.15.nix +++ b/pkgs/servers/dict/1.9.15.nix @@ -16,9 +16,7 @@ stdenv.mkDerivation rec { (textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]); meta = { - description = " - Dict protocol server and client. -"; + description = "Dict protocol server and client"; inherit src; }; } diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix index 9eb89361c356..6b981f0c4de7 100644 --- a/pkgs/servers/dict/dictd-db.nix +++ b/pkgs/servers/dict/dictd-db.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation rec { (textClosure localDefs [doInstall doForceShare doPropagate]); meta = { - description = " - ${name} dictionary for dictd. -"; + description = "${name} dictionary for dictd"; inherit src; }; }; diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix index 572cc28e55b3..e428f4d649f7 100644 --- a/pkgs/servers/irc/ircd-hybrid/default.nix +++ b/pkgs/servers/irc/ircd-hybrid/default.nix @@ -1,4 +1,5 @@ args: with args; + stdenv.mkDerivation { name = "ircd-hybrid-7.2.2"; @@ -9,15 +10,12 @@ stdenv.mkDerivation { buildInputs = [openssl zlib]; - configureFlags = ["--with-nicklen=100" - "--with-topiclen=360" - ("--enable-openssl=" + openssl)]; + configureFlags = + "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}"; preInstall = "mkdir -p \${out}/ ; ln -s /home/ircd \${out}/logs;"; meta = { - description = " - An IPv6-capable IRC server. -"; + description = "An IPv6-capable IRC server"; }; } diff --git a/pkgs/servers/xmpp/openfire/3.4.5.nix b/pkgs/servers/xmpp/openfire/3.4.5.nix index 3bb69b373419..a8d7360d8d64 100644 --- a/pkgs/servers/xmpp/openfire/3.4.5.nix +++ b/pkgs/servers/xmpp/openfire/3.4.5.nix @@ -26,9 +26,7 @@ stdenv.mkDerivation rec { (textClosure localDefs [ installPhase doForceShare doPropagate]); meta = { - description = " - XMPP server in Java. -"; - inherit src; + description = "XMPP server in Java"; + inherit src; }; } diff --git a/pkgs/servers/xmpp/openfire/3.5.2.nix b/pkgs/servers/xmpp/openfire/3.5.2.nix index 23f6f348a11b..30e44b5771f5 100644 --- a/pkgs/servers/xmpp/openfire/3.5.2.nix +++ b/pkgs/servers/xmpp/openfire/3.5.2.nix @@ -26,9 +26,7 @@ stdenv.mkDerivation rec { (textClosure localDefs [ installPhase doForceShare doPropagate]); meta = { - description = " - XMPP server in Java. -"; - inherit src; + description = "XMPP server in Java"; + inherit src; }; } |