From 7db8225aed5092f63f3e4cb8d0bfe9347a7045d7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 20 Feb 2010 11:56:23 +0000
Subject: [PATCH] Update Data Matrix library and ifx its build

svn path=/nixpkgs/trunk/; revision=20139
---
 pkgs/servers/squid/squids.nix        | 4 ++--
 pkgs/tools/graphics/dmtx/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix      | 3 ++-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index 45d289537cea..02da81b3a7ae 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -24,8 +24,8 @@ rec {
   squid3Beta = squid30.merge {
     name = "squid-3.1-beta";
     src = args.fetchurl {
-      url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.6.tar.bz2;
-      sha256 = "0crkfd5kc677baq0v6kfnwh0rc7h2a1083yh0sccy7g02vd7z3q5";
+      url = http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.0.16.tar.bz2;
+      sha256 = "0pjz8dj04146hgdlfh0hbwdsdahsicdkafj5z9nkghbjavj1x5ny";
     };
     configureFlags = ["--enable-ipv6"];
   };
diff --git a/pkgs/tools/graphics/dmtx/default.nix b/pkgs/tools/graphics/dmtx/default.nix
index e4e0bbe1f7ec..651cdbd8797a 100644
--- a/pkgs/tools/graphics/dmtx/default.nix
+++ b/pkgs/tools/graphics/dmtx/default.nix
@@ -3,16 +3,17 @@ let
   lib = args.lib;
   fetchurl = args.fetchurl;
 
-  version = lib.attrByPath ["version"] "0.7.0" args; 
+  version = lib.attrByPath ["version"] "0.7.2" args; 
   buildInputs = with args; [
     libpng libtiff libjpeg librsvg imagemagick pkgconfig
-    zlib libX11 bzip2 libtool
+    zlib libX11 bzip2 libtool freetype fontconfig 
+    ghostscript
   ];
 in
 rec {
   src = fetchurl {
     url = "http://prdownloads.sourceforge.net/libdmtx/libdmtx-${version}.tar.bz2";
-    sha256 = "00w0pvpbwqqa1c8s85v8vf8w1x116yh7qg5fplxj5jhmfizcama2";
+    sha256 = "0iin2j3ad7ldj32dwc04g28k54iv3lrc5121rgyphm7l9hvigbvk";
   };
 
   inherit buildInputs;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4a1266e4c3de..e695a4403b66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6948,7 +6948,8 @@ let
 
   dmtx = builderDefsPackage (import ../tools/graphics/dmtx) {
     inherit libpng libtiff libjpeg imagemagick librsvg
-      pkgconfig bzip2 zlib libtool;
+      pkgconfig bzip2 zlib libtool freetype fontconfig 
+      ghostscript;
     inherit (xlibs) libX11;
   };