diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2014-08-30 10:04:02 +0200 |
commit | e51f73652d38d5c53b331b7bcae2e2483e1b8afe (patch) | |
tree | 9126d3fd0737db3a0d57cda866d96c377fc0e452 /pkgs/applications/graphics/grafx2/default.nix | |
parent | a283bec71cec60c2b9c84ea9af320fc8df0dfd5f (diff) | |
parent | 4e0d2706f174bb893378a8241df7bd2055901b9e (diff) | |
download | nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.gz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.bz2 nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.lz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.xz nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.tar.zst nixlib-e51f73652d38d5c53b331b7bcae2e2483e1b8afe.zip |
Merge recent master into staging
Hydra: ?compare=1149952 Conflicts: nixos/doc/manual/configuration.xml (changed split file) nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition) pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
Diffstat (limited to 'pkgs/applications/graphics/grafx2/default.nix')
-rw-r--r-- | pkgs/applications/graphics/grafx2/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 6b7c9a27694a..ee9df683c0a2 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = ''make install prefix="$out"''; meta = { - description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance."; + description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance"; homepage = http://code.google.co/p/grafx2/; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; |