Merge pull request #147621 from AndersonTorres/new-aaphoto

flam3: 3.1.1 -> 3.1.1+date=2018-04-12
aaphoto: init at 0.43.1

pkgs/tools/graphics/aaphoto/default.nix

@@ -0,0 +1,50 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, jasper
+, libpng
+, libjpeg
+, zlib
+}:
+
+stdenv.mkDerivation rec {
+  pname = "aaphoto";
+  version = "0.43.1";
+
+  src = fetchFromGitHub {
+    owner = "log69";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-qngWWqV2vLm1gO0KJ0uHOCf2IoEAs1oiygpJtDvt3s8=";
+  };
+
+  buildInputs = [
+    jasper
+    libpng
+    libjpeg
+    zlib
+  ];
+
+  postInstall = ''
+    install -Dm644 NEWS README REMARKS TODO -t $out/share/doc/${pname}
+  '';
+
+  meta = with lib; {
+    homepage = "http://log69.com/aaphoto_en.html";
+    description = "Free and open source automatic photo adjusting software";
+    longDescription = ''
+      Auto Adjust Photo tries to give a solution for the automatic color
+      correction of photos. This means setting the contrast, color balance,
+      saturation and gamma levels of the image by analization.
+
+      This can be a solution for those kind of users who are not able to manage
+      and correct images with complicated graphical softwares, or just simply
+      don't intend to spend a lot of time with manually correcting the images
+      one-by-one.
+    '';
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.unix;
+    broken = stdenv.isDarwin; # aaphoto.c:237:10: fatal error: 'omp.h' file not found
+  };
+}

pkgs/tools/graphics/flam3/default.nix

@@ -1,24 +1,42 @@
-{lib, stdenv, fetchFromGitHub, zlib, libpng, libxml2, libjpeg }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, libjpeg
+, libpng
+, libxml2
+, zlib
+}:
 
 stdenv.mkDerivation rec {
   pname = "flam3";
-  version = "3.1.1-${lib.strings.substring 0 7 rev}";
-  rev = "e0801543538451234d7a8a240ba3b417cbda5b21";
+  version = "3.1.1+date=2018-04-12";
 
   src = fetchFromGitHub {
-    inherit rev;
     owner = "scottdraves";
     repo = pname;
-    sha256 = "18iyj16k0sn3fs52fj23lj31xi4avlddhbib6kk309576nlxp17w";
+    rev = "7fb50c82e90e051f00efcc3123d0e06de26594b2";
+    hash = "sha256-cKRfmTcyWY2LyxqojTzxD2wnxu5eh3emHi51bhS3gYg=";
   };
 
-  buildInputs = [ zlib libpng libxml2 libjpeg ];
+  buildInputs = [
+    libjpeg
+    libpng
+    libxml2
+    zlib
+  ];
 
   meta = with lib; {
-    description = "Cosmic recursive fractal flames";
     homepage = "https://flam3.com/";
-    maintainers = with maintainers; [ ];
-    platforms = platforms.linux;
+    description = "Cosmic recursive fractal flames";
+    longDescription = ''
+      Flames are algorithmically generated images and animations. The software
+      was originally written in 1992 and released as open source, aka free
+      software. Over the years it has been greatly expanded, and is now widely
+      used to create art and special effects. The shape and color of each image
+      is specified by a long string of numbers - a genetic code of sorts.
+    '';
     license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ AndersonTorres ];
+    platforms = platforms.linux;
   };
 }

pkgs/top-level/all-packages.nix

@@ -32227,6 +32227,8 @@ with pkgs;
 
   electricsheep = callPackage ../misc/screensavers/electricsheep { };
 
+  aaphoto = callPackage ../tools/graphics/aaphoto {};
+
   flam3 = callPackage ../tools/graphics/flam3 { };
 
   glee = callPackage ../tools/graphics/glee { };