From 66236eeb4bb0c8ef1b61e4ffe2d829acbbd2ffaf Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 27 Nov 2021 14:39:33 -0300 Subject: [PATCH 1/3] flam3: 3.1.1 -> 3.1.1+date=2018-04-12 --- pkgs/tools/graphics/flam3/default.nix | 36 ++++++++++++++++++++------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/graphics/flam3/default.nix b/pkgs/tools/graphics/flam3/default.nix index bd959e3227e7..01e3693259a5 100644 --- a/pkgs/tools/graphics/flam3/default.nix +++ b/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; }; } From fc66ea690a8eb88734af58cd1c533935dc9ec4f4 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 27 Nov 2021 14:14:30 -0300 Subject: [PATCH 2/3] aaphoto: init at 0.43.1 --- pkgs/tools/graphics/aaphoto/default.nix | 49 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 51 insertions(+) create mode 100644 pkgs/tools/graphics/aaphoto/default.nix diff --git a/pkgs/tools/graphics/aaphoto/default.nix b/pkgs/tools/graphics/aaphoto/default.nix new file mode 100644 index 000000000000..1d0900759320 --- /dev/null +++ b/pkgs/tools/graphics/aaphoto/default.nix @@ -0,0 +1,49 @@ +{ 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; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 404b07db8a81..dc5728ac01ed 100644 --- a/pkgs/top-level/all-packages.nix +++ b/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 { }; From 9440449acbf32742850395c22345efe2e69ee322 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 27 Nov 2021 17:10:39 -0300 Subject: [PATCH 3/3] aaphoto: set meta.broken to true in Darwin It fails detecting OpenMP libraries. --- pkgs/tools/graphics/aaphoto/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/graphics/aaphoto/default.nix b/pkgs/tools/graphics/aaphoto/default.nix index 1d0900759320..1487f9eac435 100644 --- a/pkgs/tools/graphics/aaphoto/default.nix +++ b/pkgs/tools/graphics/aaphoto/default.nix @@ -45,5 +45,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # aaphoto.c:237:10: fatal error: 'omp.h' file not found }; }