diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 12:23:18 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-31 12:23:18 +0200 |
| commit | 8da52a642a293c5b62d044d61e8dd5f5c05eaeb6 (patch) | |
| tree | 0fbbc6b2a4103f52619d0df114015d79b1bb9f49 /pkgs/tools/compression | |
| parent | 4c3e6a46754f32c059484b25e35925a92a7c9574 (diff) | |
| parent | acba6b4da25e4b92e2422036104ad2040bef1acd (diff) | |
| download | nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.gz nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.bz2 nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.lz nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.xz nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.tar.zst nixlib-8da52a642a293c5b62d044d61e8dd5f5c05eaeb6.zip | |
Merge branch 'staging' into v/modular
Conflicts (easy): pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/development/libraries/gtk+/2.x.nix
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/gzip/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/compression/rzip/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index 53c71346fc14..320683a3b67c 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/gzip/; - description = "Gzip, the GNU zip compression program"; + description = "GNU zip compression program"; longDescription = ''gzip (GNU zip) is a popular data compression program written by diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index ca8d356abb3e..4460ae6edf3e 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://rzip.samba.org/; - description = "The RZIP compression program"; + description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; }; } |