From a444b34b52b13b1658875633f871b96456b1cd71 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 29 Jul 2017 15:04:34 +0200 Subject: facedetect: init at 0.1 --- pkgs/tools/graphics/facedetect/default.nix | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 pkgs/tools/graphics/facedetect/default.nix (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/facedetect/default.nix b/pkgs/tools/graphics/facedetect/default.nix new file mode 100644 index 000000000000..02a3a70fe516 --- /dev/null +++ b/pkgs/tools/graphics/facedetect/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchFromGitHub, python2Packages }: + +stdenv.mkDerivation rec { + name = "facedetect-${version}"; + version = "0.1"; + + src = fetchFromGitHub { + owner = "wavexx"; + repo = "facedetect"; + rev = "v${version}"; + sha256 = "0mddh71cjbsngpvjli406ndi2x613y39ydgb8bi4z1jp063865sd"; + }; + + buildInputs = [ python2Packages.python python2Packages.wrapPython ]; + pythonPath = [ python2Packages.numpy python2Packages.opencv ]; + + phases = [ "unpackPhase" "patchPhase" "installPhase" ]; + + patchPhase = '' + substituteInPlace facedetect \ + --replace /usr/share/opencv "${python2Packages.opencv}/share/OpenCV" + ''; + + installPhase = '' + install -v -m644 -D README.rst $out/share/doc/${name}/README.rst + install -v -m755 -D facedetect $out/bin/facedetect + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + homepage = https://www.thregr.org/~wavexx/software/facedetect/; + description = "A simple face detector for batch processing"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = [ maintainers.rycee ]; + }; +} -- cgit 1.4.1 From 138dd4f9f194936fbeed67467124caa5de04fcf4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 29 Jul 2017 16:19:09 +0200 Subject: fgallery: 1.8 -> 1.8.2 --- pkgs/tools/graphics/fgallery/default.nix | 11 +++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 4b263b555d21..439a01584c32 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -1,6 +1,5 @@ -{ stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool, JSON -, coreutils, zip, imagemagick, pngcrush, lcms2, fbida -}: +{ stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool +, CpanelJSONXS, coreutils, zip, imagemagick, pngcrush, lcms2, fbida }: # TODO: add optional dependencies (snippet from fgallery source): # @@ -11,14 +10,14 @@ # fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)"); stdenv.mkDerivation rec { - name = "fgallery-1.8"; + name = "fgallery-1.8.2"; src = fetchurl { url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; - sha256 = "1n237sk7fm4yrpn69qaz9fwbjl6i94y664q7d16bhngrcil3bq1d"; + sha256 = "18wlvqbxcng8pawimbc8f2422s8fnk840hfr6946lzsxr0ijakvf"; }; - buildInputs = [ unzip makeWrapper perl ImageExifTool JSON ]; + buildInputs = [ unzip makeWrapper perl ImageExifTool CpanelJSONXS ]; installPhase = '' mkdir -p "$out/bin" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d008c7276447..05ff56aef28d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1911,7 +1911,7 @@ with pkgs; ferm = callPackage ../tools/networking/ferm { }; fgallery = callPackage ../tools/graphics/fgallery { - inherit (perlPackages) ImageExifTool JSON; + inherit (perlPackages) ImageExifTool CpanelJSONXS; }; flannel = callPackage ../tools/networking/flannel { }; -- cgit 1.4.1 From 9d4d62923ae10de107a4e0693aa859c80710bb7b Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 29 Jul 2017 16:22:54 +0200 Subject: fgallery: add support for facedetect --- pkgs/tools/graphics/fgallery/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 439a01584c32..424cf5c1bdc6 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -1,13 +1,12 @@ { stdenv, fetchurl, unzip, makeWrapper, perl, ImageExifTool -, CpanelJSONXS, coreutils, zip, imagemagick, pngcrush, lcms2, fbida }: +, CpanelJSONXS, coreutils, zip, imagemagick, pngcrush, lcms2 +, facedetect, fbida }: # TODO: add optional dependencies (snippet from fgallery source): # # if(system("jpegoptim -V >/dev/null 2>&1")) { # $jpegoptim = 0; # } -# if($facedet && system("facedetect -h >/dev/null 2>&1")) { -# fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)"); stdenv.mkDerivation rec { name = "fgallery-1.8.2"; @@ -34,7 +33,7 @@ stdenv.mkDerivation rec { wrapProgram "$out/share/fgallery/fgallery" \ --set PERL5LIB "$PERL5LIB" \ --set PATH "${stdenv.lib.makeBinPath - [ coreutils zip imagemagick pngcrush lcms2 fbida ]}" + [ coreutils zip imagemagick pngcrush lcms2 facedetect fbida ]}" ''; meta = with stdenv.lib; { -- cgit 1.4.1 From bc8b634072f77149a6441f9f448cdcecc915bb6c Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 30 Jul 2017 00:56:20 +0200 Subject: maim: 5.4.64 -> 5.4.65 --- pkgs/tools/graphics/maim/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index 39933e70e39f..791f1bf09e10 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -1,22 +1,22 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , zlib, libpng, libjpeg -, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop }: +, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }: stdenv.mkDerivation rec { name = "maim-${version}"; - version = "5.4.64"; + version = "5.4.65"; src = fetchFromGitHub { owner = "naelstrof"; repo = "maim"; rev = "v${version}"; - sha256 = "16ipqs4s5hn7a7380n8w1ijj26d9n356bqwl1h8z5i1skbj4w7hj"; + sha256 = "0jkvsqzwsb986bm424xpfj73d46afkvbimf1ipdss2vg2y77vmj3"; }; nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ zlib libpng libjpeg mesa glm libX11 libXext libXfixes libXrandr - libXcomposite slop ]; + libXcomposite slop icu ]; doCheck = false; -- cgit 1.4.1