From eed2fa3de47fac257351a21f2c3addc9cd45848e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 6 Jan 2016 03:10:56 +0100 Subject: qrdecode: remove dead package Never maintained, no updates since 2010, and broken since 2013. Bye. --- pkgs/tools/graphics/qrdecode/default.nix | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 pkgs/tools/graphics/qrdecode/default.nix (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/qrdecode/default.nix b/pkgs/tools/graphics/qrdecode/default.nix deleted file mode 100644 index 308183d7ae11..000000000000 --- a/pkgs/tools/graphics/qrdecode/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl, libpng, opencv }: - -stdenv.mkDerivation rec { - name = "libdecodeqr-${version}"; - version = "0.9.3"; - - src = fetchurl { - url = "mirror://debian/pool/main/libd/libdecodeqr/libdecodeqr_${version}.orig.tar.gz"; - sha256 = "1kmljwx69h7zq6zlp2j19bbpz11px45z1abw03acrxjyzz5f1f13"; - }; - - buildInputs = [ libpng opencv ]; - - preConfigure = '' - cd src - sed -e /LDCONFIG/d -i libdecodeqr/Makefile.in - sed -e '/#include /a#include ' -i libdecodeqr/imagereader.h - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${opencv}/include/opencv" - export NIX_LDFLAGS="$NIX_LDFLAGS -lcxcore" - ''; - - preInstall = "mkdir -p $out/bin $out/lib $out/include $out/share"; - postInstall = "cp sample/simple/simpletest $out/bin/qrdecode"; - - meta = { - description = "QR code decoder library"; - broken = true; - }; -} -- cgit 1.4.1 From f54ed090965481369b6d878105587fb3909872c9 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Wed, 6 Jan 2016 20:33:00 +0100 Subject: jhead: add libjpeg as dependency The `jpegtran` tool from libjpeg is required for the `-autorot` command. --- pkgs/tools/graphics/jhead/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix index 470a2efdf6ba..dfbd7c4e5e06 100644 --- a/pkgs/tools/graphics/jhead/default.nix +++ b/pkgs/tools/graphics/jhead/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, libjpeg }: stdenv.mkDerivation rec { name = "jhead-${version}"; @@ -9,12 +9,15 @@ stdenv.mkDerivation rec { sha256 = "0pl9s9ssb2a9di82f3ypin2hd098ns8kzdsxw3i2y94f07d03k48"; }; + buildInputs = [ libjpeg ]; + patchPhase = '' substituteInPlace makefile \ --replace /usr/local/bin $out/bin substituteInPlace jhead.c \ - --replace "\" Compiled: \"__DATE__" "" + --replace "\" Compiled: \"__DATE__" "" \ + --replace "jpegtran -trim" "${libjpeg}/bin/jpegtran -trim" ''; installPhase = '' -- cgit 1.4.1 From e1873ade382294a4e49acfe68ab811c119f12766 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 9 Jan 2016 16:33:54 +0000 Subject: pngcrush: 1.7.85 -> 1.7.92 also fixes a compilation issue on OSX --- pkgs/tools/graphics/pngcrush/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index cc086da5a132..d4383e363491 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libpng }: stdenv.mkDerivation rec { - name = "pngcrush-1.7.85"; + name = "pngcrush-1.7.92"; src = fetchurl { url = "mirror://sourceforge/pmt/${name}-nolib.tar.xz"; - sha256 = "1hvcync32x2ign694scafkj7xc73gzyy8n2l5z026yxckilyyv19"; + sha256 = "0dlwbqckv90cpvg8qhkl3nk5yb75ddi61vbpmmp9n0j6qq9lp6y4"; }; configurePhase = '' -- cgit 1.4.1 From 93ddfbacd4a25eab23eb5eba073638c6af7657d2 Mon Sep 17 00:00:00 2001 From: zimbatm Date: Sat, 9 Jan 2016 16:35:27 +0000 Subject: pngcrush: fixes compilation on darwin --- pkgs/tools/graphics/pngcrush/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/pngcrush/default.nix b/pkgs/tools/graphics/pngcrush/default.nix index d4383e363491..6a6f3e7b13c6 100644 --- a/pkgs/tools/graphics/pngcrush/default.nix +++ b/pkgs/tools/graphics/pngcrush/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0dlwbqckv90cpvg8qhkl3nk5yb75ddi61vbpmmp9n0j6qq9lp6y4"; }; + makeFlags = [ "CC=cc" "LD=cc" ]; # gcc and/or clang compat + configurePhase = '' sed -i s,/usr,$out, Makefile ''; @@ -18,7 +20,7 @@ stdenv.mkDerivation rec { homepage = http://pmt.sourceforge.net/pngcrush; description = "A PNG optimizer"; license = stdenv.lib.licenses.free; - platforms = with stdenv.lib.platforms; linux; + platforms = with stdenv.lib.platforms; linux ++ darwin; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } -- cgit 1.4.1 From 79e145a970b476eaac79e92e1952232b9892e509 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Mon, 11 Jan 2016 11:36:50 +0100 Subject: gnuplot: Improve startup performance Before executing the gnuplot executable the environment variable `GDFONTPATH` is populated with a list of font directories, which is obtained from `fc-list`. In that process we iterated over each line and called `dirname` on it, which introduces a performance hit for loading and executing the external executable `dirname` every time. The new version avoids the loop. The author of this patch measured a 42 fold performance improvement: old version: $ time ./gnuplot_old/bin/gnuplot -e '' real 0m3.828s user 0m0.392s sys 0m0.465s new version: $ time ./gnuplot_new2/bin/gnuplot -e '' real 0m0.091s user 0m0.112s sys 0m0.014s The correctness of the value of `GDFONTPATH` was confirmed with the following command and comparing its output between versions: $ gnuplot -e 'print system("echo $GDFONTPATH")' --- pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh index 4886b4f2b7c0..92ad2e97b5b4 100644 --- a/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh +++ b/pkgs/tools/graphics/gnuplot/set-gdfontpath-from-fontconfig.sh @@ -1,4 +1,4 @@ -p=( $(for n in $(fc-list | sed -r -e 's|^([^:]+):.*$|\1|'); do echo $(dirname "$n"); done | sort | uniq) ) +p=( $(fc-list : file | sed "s@/[^/]*: @@" | sort -u) ) IFS=: export GDFONTPATH="${GDFONTPATH}${GDFONTPATH:+:}${p[*]}" unset IFS p -- cgit 1.4.1 From 0dc1bc4aee1f6eb64160113c28cda1622760a2b8 Mon Sep 17 00:00:00 2001 From: Svein Ove Aas Date: Sun, 17 Jan 2016 04:05:39 +0000 Subject: fgallery: 1.7 -> 1.8 --- pkgs/tools/graphics/fgallery/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkgs/tools/graphics') diff --git a/pkgs/tools/graphics/fgallery/default.nix b/pkgs/tools/graphics/fgallery/default.nix index 4b0531aa1ced..6b8de80ee70e 100644 --- a/pkgs/tools/graphics/fgallery/default.nix +++ b/pkgs/tools/graphics/fgallery/default.nix @@ -11,11 +11,11 @@ # fatal("cannot run \"facedetect\" (see http://www.thregr.org/~wavexx/hacks/facedetect/)"); stdenv.mkDerivation rec { - name = "fgallery-1.7"; + name = "fgallery-1.8"; src = fetchurl { url = "http://www.thregr.org/~wavexx/software/fgallery/releases/${name}.zip"; - sha256 = "1iix6p8viwnsq3zn9vg99sx20nmgk2p5als3j1lk914nz3anvai4"; + sha256 = "1n237sk7fm4yrpn69qaz9fwbjl6i94y664q7d16bhngrcil3bq1d"; }; buildInputs = [ unzip makeWrapper perl ImageExifTool JSON ]; -- cgit 1.4.1