From 4789ced5786f2cff87f15c6dde9f9aee3caa32c4 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Sun, 4 Jul 2010 21:10:54 +0000
Subject: GNU Idutils 4.5.

svn path=/nixpkgs/trunk/; revision=22461
---
 pkgs/tools/misc/idutils/default.nix       |  9 ++++++---
 pkgs/tools/misc/idutils/nix-mapping.patch | 20 +++++++++++---------
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'pkgs')

diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix
index a1ed9e9e449a..00541c053399 100644
--- a/pkgs/tools/misc/idutils/default.nix
+++ b/pkgs/tools/misc/idutils/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, emacs }:
 
 stdenv.mkDerivation rec {
-  name = "idutils-4.2";
+  name = "idutils-4.5";
   
   src = fetchurl {
     url = "mirror://gnu/idutils/${name}.tar.gz";
-    sha256 = "16gsy7vrjax2zl4galwq03l0y97d18p0pyd5cccyc4i8y3mhwx65";
+    sha256 = "0j92k2dwg381kx2z556v9162l16mfra3xqbfcjrkdd2fw5jsgn2q";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isLinux emacs;
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
     '';
 
     homepage = http://www.gnu.org/software/idutils/;
-    license = "GPLv2+";
+    license = "GPLv3+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/misc/idutils/nix-mapping.patch b/pkgs/tools/misc/idutils/nix-mapping.patch
index 43e7439e2f60..6f92ffa07b52 100644
--- a/pkgs/tools/misc/idutils/nix-mapping.patch
+++ b/pkgs/tools/misc/idutils/nix-mapping.patch
@@ -1,10 +1,12 @@
-diff --git a/libidu/id-lang.map b/libidu/id-lang.map
-index 7edb860..6dccd28 100644
---- a/libidu/id-lang.map
-+++ b/libidu/id-lang.map
-@@ -92,3 +92,5 @@ Makefile.*		make
- 
- *.gz			FILTER gzip -d <%s
- *.Z			FILTER gzip -d <%s
-+
+Recognize `.nix' files as text files.
+
+--- idutils-4.5/libidu/id-lang.map	2009-05-17 16:38:42.000000000 +0200
++++ idutils-4.5/libidu/id-lang.map	2010-07-04 15:52:48.000000000 +0200
+@@ -88,6 +88,7 @@ GNUmakefile		make
+ *.doc			text
+ *.txt			text
+ *.org			text
 +*.nix			text
+ 
+ *.m4			m4
+ *.ac			m4
-- 
cgit 1.4.1