diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-05-01 15:57:09 -0700 |
| commit | 00df204c82bd6d585c3f19d1a31588fa72519184 (patch) | |
| tree | 4201fed8adf0505e787b9cf335cd52a7ad657570 /pkgs/desktops | |
| parent | 8591db4b10e50ad3b61b1708787e4de314424d5d (diff) | |
| parent | cf0b6b7be866aaeac75c2ee24245a7bb6ba633b2 (diff) | |
| download | nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.gz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.bz2 nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.lz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.xz nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.tar.zst nixlib-00df204c82bd6d585c3f19d1a31588fa72519184.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/desktops')
| -rw-r--r-- | pkgs/desktops/e19/econnman.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/kde-4.14/kdeedu/artikulate.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index 8eaebaf0af38..08d7a8c3e735 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Econnman is a user interface for the connman network connection manager"; + description = "A user interface for the connman network connection manager"; homepage = http://enlightenment.org/; maintainers = with stdenv.lib.maintainers; [ matejc tstrobel ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix index b1828766f220..8674a774443f 100644 --- a/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix +++ b/pkgs/desktops/kde-4.14/kdeedu/artikulate.nix @@ -3,6 +3,6 @@ kde { buildInputs = [ kdelibs qt_gstreamer1 ]; meta = { - description = "Artikulate is a pronunciation learning program for KDE."; + description = "A pronunciation learning program for KDE"; }; } |