From 932d5bee544e39b0e06ba2e850fe2d7fa89b030f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 16 May 2012 22:06:27 +0000
Subject: * X.org 7.7 RC1.  Note that xorg-server doesn't build yet.

svn path=/nixpkgs/branches/x-updates/; revision=34147
---
 pkgs/tools/admin/tigervnc/default.nix | 2 --
 1 file changed, 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index 36aae0684385..de61d1e556bd 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -6,8 +6,6 @@
 , libxkbfile, libXfont, libpciaccess
 }:
 
-
-
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-- 
cgit 1.4.1


From 41840af6894bf718a1038ba1045adef26a687919 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 May 2012 02:52:36 +0000
Subject: * Add a setup hook ‘autoreconfHook’ to simplify packages that need to
   run autoreconf:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

    buildInputs = [ autoreconfHook ];

  is essentially equivalent to

    buildInputs = [ autoconf automake libtool ];
    preConfigure = "autoreconf -i";

svn path=/nixpkgs/branches/x-updates/; revision=34181
---
 pkgs/build-support/make-wrapper/make-wrapper.sh | 102 ------------------------
 pkgs/build-support/setup-hooks/autoreconf.sh    |  11 +++
 pkgs/build-support/setup-hooks/make-wrapper.sh  | 102 ++++++++++++++++++++++++
 pkgs/os-specific/linux/mountall/default.nix     |   6 +-
 pkgs/os-specific/linux/usbutils/default.nix     |   4 +-
 pkgs/tools/networking/sitecopy/default.nix      |   6 +-
 pkgs/top-level/all-packages.nix                 |  10 ++-
 7 files changed, 125 insertions(+), 116 deletions(-)
 delete mode 100644 pkgs/build-support/make-wrapper/make-wrapper.sh
 create mode 100644 pkgs/build-support/setup-hooks/autoreconf.sh
 create mode 100644 pkgs/build-support/setup-hooks/make-wrapper.sh

(limited to 'pkgs/tools')

diff --git a/pkgs/build-support/make-wrapper/make-wrapper.sh b/pkgs/build-support/make-wrapper/make-wrapper.sh
deleted file mode 100644
index 41f2a59246d1..000000000000
--- a/pkgs/build-support/make-wrapper/make-wrapper.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-makeWrapper() {
-    local original=$1
-    local wrapper=$2
-    local params varName value command separator n fileNames
-    local flagsBefore flags
-
-    mkdir -p "$(dirname $wrapper)"
-
-    echo "#! $SHELL -e" > $wrapper
-
-    params=("$@")
-    for ((n = 2; n < ${#params[*]}; n += 1)); do
-        p=${params[$n]}
-
-        if test "$p" = "--set"; then
-            varName=${params[$((n + 1))]}
-            value=${params[$((n + 2))]}
-            n=$((n + 2))
-            echo "export $varName=$value" >> $wrapper
-        fi
-
-        if test "$p" = "--run"; then
-            command=${params[$((n + 1))]}
-            n=$((n + 1))
-            echo "$command" >> $wrapper
-        fi
-
-        if test "$p" = "--suffix" -o "$p" = "--prefix"; then
-            varName=${params[$((n + 1))]}
-            separator=${params[$((n + 2))]}
-            value=${params[$((n + 3))]}
-            n=$((n + 3))
-            if test -n "$value"; then
-                if test "$p" = "--suffix"; then
-                    echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
-                else
-                    echo "export $varName=$value\${$varName:+$separator}\$$varName" >> $wrapper
-                fi
-            fi
-        fi
-
-        if test "$p" = "--suffix-each"; then
-            varName=${params[$((n + 1))]}
-            separator=${params[$((n + 2))]}
-            values=${params[$((n + 3))]}
-            n=$((n + 3))
-            for value in $values; do
-                echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
-            done
-        fi
-
-        if test "$p" = "--suffix-contents" -o "$p" = "--prefix-contents"; then
-            varName=${params[$((n + 1))]}
-            separator=${params[$((n + 2))]}
-            fileNames=${params[$((n + 3))]}
-            n=$((n + 3))
-            for fileName in $fileNames; do
-                if test "$p" = "--suffix-contents"; then
-                    echo "export $varName=\$$varName\${$varName:+$separator}$(cat $fileName)" >> $wrapper
-                else
-                    echo "export $varName=$(cat $fileName)\${$varName:+$separator}\$$varName" >> $wrapper
-                fi
-            done
-        fi
-
-        if test "$p" = "--add-flags"; then
-            flags=${params[$((n + 1))]}
-            n=$((n + 1))
-            flagsBefore="$flagsBefore $flags"
-        fi
-    done
-
-    # Note: extraFlagsArray is an array containing additional flags
-    # that may be set by --run actions.
-    echo exec "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
-    
-    chmod +x $wrapper
-}
-
-addSuffix() {
-    suffix=$1
-    shift
-    for name in "$@"; do
-        echo "$name$suffix"
-    done
-}
-
-filterExisting() {
-    for fn in "$@"; do
-        if test -e "$fn"; then
-            echo "$fn"
-        fi
-    done
-}
-
-# Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
-wrapProgram() {
-    local prog="$1"
-    local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
-    mv $prog $hidden
-    makeWrapper $hidden $prog "$@"
-}
diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh
new file mode 100644
index 000000000000..027c83221633
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/autoreconf.sh
@@ -0,0 +1,11 @@
+preConfigurePhases+=" autoreconfPhase"
+
+for i in @autoconf@ @automake@ @libtool@; do
+    findInputs $i nativePkgs propagated-build-native-inputs
+done
+
+autoreconfPhase() {
+    runHook preAutoreconf
+    autoreconf ${autoreconfFlags:---install --force}
+    runHook postAutoreconf
+}
diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh
new file mode 100644
index 000000000000..41f2a59246d1
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/make-wrapper.sh
@@ -0,0 +1,102 @@
+makeWrapper() {
+    local original=$1
+    local wrapper=$2
+    local params varName value command separator n fileNames
+    local flagsBefore flags
+
+    mkdir -p "$(dirname $wrapper)"
+
+    echo "#! $SHELL -e" > $wrapper
+
+    params=("$@")
+    for ((n = 2; n < ${#params[*]}; n += 1)); do
+        p=${params[$n]}
+
+        if test "$p" = "--set"; then
+            varName=${params[$((n + 1))]}
+            value=${params[$((n + 2))]}
+            n=$((n + 2))
+            echo "export $varName=$value" >> $wrapper
+        fi
+
+        if test "$p" = "--run"; then
+            command=${params[$((n + 1))]}
+            n=$((n + 1))
+            echo "$command" >> $wrapper
+        fi
+
+        if test "$p" = "--suffix" -o "$p" = "--prefix"; then
+            varName=${params[$((n + 1))]}
+            separator=${params[$((n + 2))]}
+            value=${params[$((n + 3))]}
+            n=$((n + 3))
+            if test -n "$value"; then
+                if test "$p" = "--suffix"; then
+                    echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
+                else
+                    echo "export $varName=$value\${$varName:+$separator}\$$varName" >> $wrapper
+                fi
+            fi
+        fi
+
+        if test "$p" = "--suffix-each"; then
+            varName=${params[$((n + 1))]}
+            separator=${params[$((n + 2))]}
+            values=${params[$((n + 3))]}
+            n=$((n + 3))
+            for value in $values; do
+                echo "export $varName=\$$varName\${$varName:+$separator}$value" >> $wrapper
+            done
+        fi
+
+        if test "$p" = "--suffix-contents" -o "$p" = "--prefix-contents"; then
+            varName=${params[$((n + 1))]}
+            separator=${params[$((n + 2))]}
+            fileNames=${params[$((n + 3))]}
+            n=$((n + 3))
+            for fileName in $fileNames; do
+                if test "$p" = "--suffix-contents"; then
+                    echo "export $varName=\$$varName\${$varName:+$separator}$(cat $fileName)" >> $wrapper
+                else
+                    echo "export $varName=$(cat $fileName)\${$varName:+$separator}\$$varName" >> $wrapper
+                fi
+            done
+        fi
+
+        if test "$p" = "--add-flags"; then
+            flags=${params[$((n + 1))]}
+            n=$((n + 1))
+            flagsBefore="$flagsBefore $flags"
+        fi
+    done
+
+    # Note: extraFlagsArray is an array containing additional flags
+    # that may be set by --run actions.
+    echo exec "$original" $flagsBefore '"${extraFlagsArray[@]}"' '"$@"' >> $wrapper
+    
+    chmod +x $wrapper
+}
+
+addSuffix() {
+    suffix=$1
+    shift
+    for name in "$@"; do
+        echo "$name$suffix"
+    done
+}
+
+filterExisting() {
+    for fn in "$@"; do
+        if test -e "$fn"; then
+            echo "$fn"
+        fi
+    done
+}
+
+# Syntax: wrapProgram <PROGRAM> <MAKE-WRAPPER FLAGS...>
+wrapProgram() {
+    local prog="$1"
+    local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped
+    mv $prog $hidden
+    makeWrapper $hidden $prog "$@"
+}
diff --git a/pkgs/os-specific/linux/mountall/default.nix b/pkgs/os-specific/linux/mountall/default.nix
index b563b80f9a9f..3d72b0a258ed 100644
--- a/pkgs/os-specific/linux/mountall/default.nix
+++ b/pkgs/os-specific/linux/mountall/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, autoconf, automake, libtool, gettext }:
+{ stdenv, fetchurl, pkgconfig, libnih, dbus, udev, gettext, autoreconfHook }:
    
 stdenv.mkDerivation {
   name = "mountall-2.35";
@@ -10,9 +10,7 @@ stdenv.mkDerivation {
 
   patches = [ ./no-plymouth.patch ./fix-usr1-race.patch ];
 
-  preConfigure = "rm -R aclocal.m4; gettextize -f; autoreconf -vfi";
-
-  buildInputs = [ pkgconfig libnih dbus.libs udev autoconf automake libtool gettext ];
+  buildInputs = [ pkgconfig libnih dbus.libs udev gettext autoreconfHook ];
 
   makeFlags = "initramfshookdir=$(out)/share/initramfs-tools/hooks upstart_jobs_initramfs_configdir=$(out)/share/initramfs-tools/event-driven/upstart-jobs";
   
diff --git a/pkgs/os-specific/linux/usbutils/default.nix b/pkgs/os-specific/linux/usbutils/default.nix
index ed8cc56d2676..5614f55a6223 100644
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, libusb1, zlib, autoconf, automake, libtool }:
+{ stdenv, fetchurl, pkgconfig, libusb1, zlib, autoreconfHook }:
 
 let
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     sha256 = "05sxkm7b7lj8p8kr8kw68m49h66351s803z42233b8lssmc3wlra";
   };
   
-  buildInputs = [ pkgconfig libusb1 autoconf automake libtool zlib ];
+  buildInputs = [ pkgconfig libusb1 autoreconfHook ];
 
   preConfigure = "autoreconf -i";
   
diff --git a/pkgs/tools/networking/sitecopy/default.nix b/pkgs/tools/networking/sitecopy/default.nix
index 6beaff56aeab..5667744ef221 100644
--- a/pkgs/tools/networking/sitecopy/default.nix
+++ b/pkgs/tools/networking/sitecopy/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, neon, zlib, openssl, autoconf, automake, libtool }:
+{ stdenv, fetchurl, neon, zlib, openssl, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "sitecopy-0.16.6";
@@ -10,9 +10,7 @@ stdenv.mkDerivation rec {
 
   patches = [ ./neon-29.patch ];
 
-  preConfigure = "autoreconf";
-
-  buildInputs = [ openssl neon zlib autoconf automake libtool ]; 
+  buildInputs = [ openssl neon zlib autoreconfHook ]; 
 
   configureFlags= "--with-ssl=openssl"; 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c5b8dde2624d..4ec940b6393e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -245,6 +245,10 @@ let
     theAttrSet = arg;
   };
 
+  autoreconfHook = makeSetupHook
+    { substitutions = { inherit autoconf automake libtool; }; }
+    ../build-support/setup-hooks/autoreconf.sh;
+
   buildEnv = import ../build-support/buildenv {
     inherit (pkgs) runCommand perl;
   };
@@ -327,7 +331,7 @@ let
     inherit stdenv perl cpio contents ubootChooser;
   };
 
-  makeWrapper = makeSetupHook {} ../build-support/make-wrapper/make-wrapper.sh;
+  makeWrapper = makeSetupHook { } ../build-support/setup-hooks/make-wrapper.sh;
 
   makeModulesClosure = {kernel, rootModules, allowMissing ? false}:
     import ../build-support/kernel/modules-closure.nix {
@@ -5824,9 +5828,7 @@ let
 
   module_init_tools = callPackage ../os-specific/linux/module-init-tools { };
 
-  mountall = callPackage ../os-specific/linux/mountall {
-    automake = automake111x;
-  };
+  mountall = callPackage ../os-specific/linux/mountall { };
 
   aggregateModules = modules:
     import ../os-specific/linux/module-init-tools/aggregator.nix {
-- 
cgit 1.4.1


From fcb1d64322d8b323ce736f9df16f6dcefd7436d5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 13 Sep 2012 11:32:03 -0400
Subject: curl: Update to 7.27.0

---
 pkgs/tools/networking/curl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 4dcab442119d..ad08065e2eb6 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -10,11 +10,11 @@ assert sslSupport -> openssl != null;
 assert scpSupport -> libssh2 != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.26.0";
+  name = "curl-7.27.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "0snj41knvy4xbfirr88l9gq5zjzz0mwlmq0mxbfgqszb2qpjdvgw";
+    sha256 = "164k2vw8v4ppsgqgk4gwhl26h70c8x3rgnl4c2s711626lhmi9db";
   };
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
-- 
cgit 1.4.1


From 7c43b041d9cf53cbeb59207138ac46b95ca4fdf0 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 14 Sep 2012 00:06:25 +0200
Subject: Add nss-pam-ldapd version 0.8.10

nss-pam-ldapd is a fork of nss_ldap that uses a daemon (nslcd) to
connect to the LDAP server, instead of going directly from PAM/NSS.
This improves performance and separation, and increases security
if you connect to LDAP with a password, since only the nscd daemon
needs to know the password, not every user of PAM/NSS.

This commit will be followed by a commit to NixOS which enables the
use of the nslcd daemon.
---
 pkgs/tools/networking/nss-pam-ldapd/default.nix | 34 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/networking/nss-pam-ldapd/default.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
new file mode 100644
index 000000000000..9abfcbbe42a1
--- /dev/null
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, openldap, python, pam, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "nss-pam-ldapd-${version}";
+  version = "0.8.10";
+  
+  src = fetchurl {
+    url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz";
+    sha256 = "673a5e235a40fd9aac74082bc64d2ac2280fc155fb00b21092650d2c963e79cc";
+  };
+  
+  buildInputs = [ makeWrapper pkgconfig python openldap pam ];
+
+  preConfigure = ''
+    substituteInPlace Makefile.in --replace "install-data-local: " "# install-data-local: "
+  '';
+
+  configureFlags = [
+    "--with-bindpw-file=/run/nslcd/bindpw"
+    "--with-nslcd-socket=/run/nslcd/socket"
+    "--with-nslcd-pidfile=/run/nslcd/nslcd.pid"
+    "--with-pam-seclib-dir=$(out)/lib/security"
+  ];
+
+  postInstall = ''
+    wrapProgram $out/sbin/nslcd --prefix LD_LIBRARY_PATH ":" $out/lib
+  '';
+
+  meta = {
+    description = "LDAP identity and authentication for NSS/PAM";
+    homepage = http://arthurdejong.org/nss-pam-ldapd/;
+    license = [ "GPLv21" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a71f3e9041d..930264707cb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1167,6 +1167,8 @@ let
     inherit (pythonPackages) pysqlite;
   };
 
+  nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {};
+
   ntfs3g = callPackage ../tools/filesystems/ntfs-3g { };
 
   # ntfsprogs are merged into ntfs-3g
-- 
cgit 1.4.1


From 4606b60dbfff27e474d5d4eb242f11351ebd4823 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 14 Sep 2012 12:02:55 -0400
Subject: nixUnstable: Update to 1.2pre2910_b674665

---
 pkgs/tools/package-management/nix/unstable.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 103d92a0ee90..dfe6e491c37e 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.2pre2793_d950cfe";
+  name = "nix-1.2pre2910_b674665";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/2955697/download/4/${name}.tar.bz2";
-    sha256 = "f91367d8e7ed795b2bc9a47fb3ecff00d005633f248ecaafa25e8e101a5dc682";
+    url = "http://hydra.nixos.org/build/3031673/download/4/${name}.tar.bz2";
+    sha256 = "fa9849f69a262547856190fe1a24e6d6bd15344fe2ef0a0e54c35ab172074a22";
   };
 
   buildNativeInputs = [ perl pkgconfig ];
@@ -27,8 +27,9 @@ stdenv.mkDerivation rec {
   configureFlags =
     ''
       --with-store-dir=${storeDir} --localstatedir=${stateDir}
-      --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
-      --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
+      --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
+      --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
+      --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
       --disable-init-state
       --enable-gc
       CFLAGS=-O3 CXXFLAGS=-O3
@@ -45,15 +46,16 @@ stdenv.mkDerivation rec {
     configureFlags =
       ''
         --with-store-dir=${storeDir} --localstatedir=${stateDir}
-        --with-dbi=${perlPackages.DBI}/lib/perl5/site_perl
-        --with-dbd-sqlite=${perlPackages.DBDSQLite}/lib/perl5/site_perl
+        --with-dbi=${perlPackages.DBI}/${perl.libPrefix}
+        --with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}
+        --with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}
         --disable-init-state
         --enable-gc
         CFLAGS=-O3 CXXFLAGS=-O3
       '' + stdenv.lib.optionalString (
           stdenv.cross ? nix && stdenv.cross.nix ? system
       ) ''--with-system=${stdenv.cross.nix.system}'';
-      
+
     doInstallCheck = false;
   };
 
-- 
cgit 1.4.1


From e678cd261120838cce11f06c71d5d5516ee5a395 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 15 Sep 2012 08:04:49 +0200
Subject: youtube-dl: Update to version 2012.02.27.

In addition, we're now switching to using refs/tags from git rather than commit
refs directly, which has the advantage, that we don't have to do bookkeeping
twice, where people forget to increment the version in nixpkgs.

This happened for the previous version, where `pkgver` had the value
"2011.12.08", but in rg3/youtube-dl@661a807c65a154eccdddb875b45e4782ca86132c the
version actually is "2012.01.08b".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/misc/youtube-dl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 0422383ed3bc..a810001d0ccf 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchgit, python}:
 
 let pkgname = "youtube-dl";
-    pkgver  = "2011.12.08";
+    pkgver  = "2012.02.27";
     
 in
 stdenv.mkDerivation {
@@ -9,8 +9,8 @@ stdenv.mkDerivation {
 
   src = fetchgit {
     url = "git://github.com/rg3/${pkgname}";
-    rev = "661a807c65a154eccdddb875b45e4782ca86132c";
-    sha256 = "32fd193b867b122400e9d5d32f6dfaf15704f837a9dc2ff809e1ce06712857ba";
+    rev = "refs/tags/${pkgver}";
+    sha256 = "17270ba14f42e8f2813bc6a0eb3674e51592eede69612e156e7d99a96fd147ce";
   };
 
   buildInputs = [python];
-- 
cgit 1.4.1


From 029aabe7f38a5a030c3568ce610f40cc63156e1b Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Sun, 16 Sep 2012 22:41:32 +0200
Subject: mtdutils: updating, and making them build

The previous 1.3.1 wasn't properly fetched by fetchgit, somehow.
---
 pkgs/tools/filesystems/mtdutils/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/filesystems/mtdutils/default.nix b/pkgs/tools/filesystems/mtdutils/default.nix
index 9e7e3a16e01c..4cb09d53adcf 100644
--- a/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/pkgs/tools/filesystems/mtdutils/default.nix
@@ -1,22 +1,19 @@
 {stdenv, fetchgit, libuuid, lzo, zlib, acl}:
 
 let
-  version = "1.3.1";
+  version = "1.5.0";
 in
 stdenv.mkDerivation {
   name = "mtd-utils-${version}";
 
   src = fetchgit {
     url = git://git.infradead.org/mtd-utils.git;
-    rev = "v" + version;
-    sha256 = "0pjjs9x03bgvphqwlw99c2cpkpjsx0vkqi79vjl7fcb9pyrghgd1";
+    rev = "refs/tags/v" + version;
+    sha256 = "cc645c0ec28083431b11f3b38f9f7759378d89e11047a883529f703e1b6c1cce";
   };
 
   patchPhase = ''
     sed -i -e s,/usr/local,, -e s,/usr,$out, common.mk
-
-    # gcc 4.5.1 issues a warning where 4.4.3 did not
-    sed -i -e s/-Werror// ubi-utils/old-utils/Makefile
   '';
 
   buildInputs = [ libuuid lzo zlib acl ];
-- 
cgit 1.4.1


From 0444a83417f8ae42d407c9470c207cac1e76aac5 Mon Sep 17 00:00:00 2001
From: Petr Rockai <me@mornfall.net>
Date: Tue, 18 Sep 2012 09:23:27 +0200
Subject: texlive-beamer: 3.07 -> 3.10 (works with texlive 2012 now)

---
 pkgs/tools/typesetting/tex/texlive/beamer.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/typesetting/tex/texlive/beamer.nix b/pkgs/tools/typesetting/tex/texlive/beamer.nix
index 851ad0707a1d..bf9079ab1046 100644
--- a/pkgs/tools/typesetting/tex/texlive/beamer.nix
+++ b/pkgs/tools/typesetting/tex/texlive/beamer.nix
@@ -1,9 +1,9 @@
 args: with args;
 rec {
-  name = "texlive-beamer-2007";
+  name = "texlive-beamer-2012";
   src = fetchurl {
-    url = mirror://debian/pool/main/l/latex-beamer/latex-beamer_3.07.orig.tar.gz;
-    sha256 = "07ldhg5f0hcnhjgzg5g8ailqacn8zhqc8nl2jkxc43c2qxbvswbv";
+    url = mirror://debian/pool/main/l/latex-beamer/latex-beamer_3.10.orig.tar.gz;
+    sha256 = "1vk7nr1lxinyj941nz5xzcpzircd60s8sgmq7jd2gqmf5ynd27nx";
   };
 
   buildInputs = [texLive];
-- 
cgit 1.4.1


From 570dcf67887b306f210ab22a04020523ac952c23 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 18 Sep 2012 19:33:12 +0200
Subject: smartmontools: update drivedb.h to latest version

---
 pkgs/tools/system/smartmontools/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index eee0b0de571d..b79e92b52370 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -1,5 +1,11 @@
 { stdenv, fetchurl }:
 
+let
+  driverdb = fetchurl {
+    url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/branches/RELEASE_5_43_DRIVEDB/smartmontools/drivedb.h?revision=3605";
+    sha256 = "1kibx5aal903hcpy6mjmfik6n9j142i3q3vvrcp1wmz10mfsqj8f";
+  };
+in
 stdenv.mkDerivation rec {
   name = "smartmontools-5.43";
 
@@ -8,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "d845187d1500b87ef8d2c43772bd0218a59114fe58474a903c56777c9175351e";
   };
 
+  patchPhase = "cp ${driverdb} drivedb.h";
+
   meta = {
     description = "Tools for monitoring the health of hard drivers";
     homepage = "http://smartmontools.sourceforge.net/";
-- 
cgit 1.4.1


From 2322899a1fa85f6547004b2829af81e7b444f506 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 18 Sep 2012 17:01:08 -0400
Subject: openssh: Update to 6.1p1

---
 pkgs/tools/networking/openssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index f708ede2f69f..c1504697a186 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -13,11 +13,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "openssh-6.0p1";
+  name = "openssh-6.1p1";
 
   src = fetchurl {
     url = "ftp://ftp.nl.uu.net/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz";
-    sha1 = "f691e53ef83417031a2854b8b1b661c9c08e4422";
+    sha1 = "751c92c912310c3aa9cadc113e14458f843fc7b3";
   };
 
   prePatch = stdenv.lib.optionalString hpnSupport
-- 
cgit 1.4.1


From ef9a15a5a4952e36c111edfba3c6716c43a49090 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Wed, 19 Sep 2012 11:48:27 +0200
Subject: fix/update debootstrap (thereby updating fakeroot)

fakeroot is used to create devices.tar.gz now (thanks to aszlig)
---
 pkgs/tools/misc/debootstrap/default.nix | 125 +++++++++++++++++++-------------
 pkgs/tools/system/fakeroot/default.nix  |  18 +++--
 2 files changed, 86 insertions(+), 57 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 33a1fc839ce0..39666f461721 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,55 +1,68 @@
-{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget }:
+{ stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }:
 
 let
 
-  devices = fetchurl {
-    url = mirror://gentoo/distfiles/devices.tar.gz;
-    sha256 = "0j4yhajmlgvbksr2ij0dm7jy3q52j3wzhx2fs5lh05i1icygk4qd";
+# USAGE like this: debootstrap sid /tmp/target-chroot-directory
+
+# There is also cdebootstrap now. Is that easier to maintain?
+
+  makedev = stdenv.mkDerivation {
+    name = "makedev-for-debootstrap";
+    src = fetchurl {
+            url = http://ftp.de.debian.org/debian/pool/main/m/makedev/makedev_2.3.1.orig.tar.gz;
+            sha256 = "1yhxlj2mhn1nqkx1f0sn0bl898nf28arxxa4lgp7hdrb5cpp36c5";
+    };
+    patches = [
+      (fetchurl {
+       url = "http://ftp.de.debian.org/debian/pool/main/m/makedev/makedev_2.3.1-89.diff.gz";
+       sha256 = "1zbifw2jkq6471fb67y893nq4lq009xbfbi57jbjwxnhqmrppcy9";
+       })
+    ];
+    # TODO install man
+    installPhase = ''
+      ensureDir $out/sbin
+      ls -l
+      t=$out/sbin/MAKEDEV
+      cp MAKEDEV $t
+      chmod +x $t
+    '';
   };
   
 in
 
 stdenv.mkDerivation {
-  name = "debootstrap-1.0.10lenny";
+
+  name = "debootstrap-1.0.42";
 
   src = fetchurl {
-    # I'd like to use the source. However it's lacking the lanny script ?
-    url = mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.10lenny1_all.deb;
-    sha256 = "a70af8e3369408ce9d6314fb5219de73f9523b347b75a3b07ee17ea92c445051";
+    # git clone git://git.debian.org/d-i/debootstrap.git
+    # I'd like to use the source. However it's lacking the lanny script ? (still true?)
+    url = http://ftp.de.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.42.tar.gz;
+    sha256 = "0a5azl22wz1q92b2c91zlpz6krd7wqyi63yk87vyczp363ml0nz0";
   };
-  
+  # unpackPhase = ''
+    # dpkg-deb --extract "$src" .
+  # '';
+
   buildInputs = [ dpkg gettext gawk perl ];
 
-  unpackPhase = ''
-    dpkg-deb --extract "$src" .
-  '';
-  
   buildPhase = ":";
 
-  patches = [
-    # replace /usr/* and /sbin/* executables by @executable@ so that they can be replaced by substitute
-    # Be careful not to replace code being run in the debian chroot !
-    ./subst.patch
-  ];
-
-  # from deb 
+  # If you have to update the patch for functions a vim regex like this
+  # can help you identify which lines are used to write scripts on TARGET and
+  # which should /bin/ paths should be replaced:
+  # \<echo\>\|\/bin\/\|^\s*\<cat\>\|EOF\|END
   installPhase = ''
-    cp -r . $out; cd $out
-    t=bin/debootstrap
-    mkdir -p bin man/man8
-    cat >> $t << EOF
-    #!/bin/sh
-    export DEBOOTSTRAP_DIR=$out/usr/share/debootstrap
-    # mount and other tools must be found in chroot. So add default debain paths!
-    # TODO only add paths which are required by the scripts!
-    export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-    $out/usr/sbin/debootstrap "\$@"
-    EOF
-    chmod +x $t
-    mv usr/share/man/man8/debootstrap.8.gz man/man8
 
-    set -x
-    for file in usr/share/debootstrap/functions usr/sbin/debootstrap; do
+    sed -i \
+      -e 's@/usr/bin/id@id@' \
+      -e 's@/usr/bin/dpkg@${dpkg}/bin/dpkg@' \
+      -e 's@/usr/bin/sha@${coreutils}/bin/sha@' \
+      -e 's@/bin/sha@${coreutils}/bin/sha@' \
+      debootstrap
+
+
+    for file in functions debootstrap; do
       substituteInPlace "$file" \
         --subst-var-by gunzip "$(type -p gunzip)" \
         --subst-var-by bunzip "$(type -p bunzip)" \
@@ -61,28 +74,36 @@ stdenv.mkDerivation {
         --subst-var-by uname "$(type -p uname)" \
         --subst-var-by wget "${wget}/bin/wget"
     done
-  '';
 
-  /* build from source:
-  installPhase = ''
-    cp ${devices} devices.tar.gz
-    mkdir -p $out/{bin,man/man8};
-    cp debootstrap.8 $out/man/man8
+
     sed -i  \
-      -e 's@-o root@@'   \
-      -e 's@-g root@@'   \
-      -e 's@chown@true@' \
-      Makefile
-    make pkgdetails debootstrap-arch
-    make DESTDIR="''\${out}" install-arch
-    t=$out/bin/debootstrap
-    cat >> $t << EOF
+      -e 's@\<wget\>@${wget}/bin/wget@' \
+      functions
+
+    d=$out/share/debootstrap
+    ensureDir $out/{share/debootstrap,bin}
+
+    ${fakeroot}/bin/fakeroot -- make devices.tar.gz MAKEDEV=${makedev}/sbin/MAKEDEV
+
+    cp -r . $d
+
+    cat >> $out/bin/debootstrap << EOF
     #!/bin/sh
-    DEBOOTSTRAP_DIR=$out/usr/share/debootstrap $out/usr/sbin/debootstrap "\$@"
+    export DEBOOTSTRAP_DIR="''${DEBOOTSTRAP_DIR:-$d}"
+    # mount and other tools must be found in chroot. So add default debain paths!
+    # TODO only add paths which are required by the scripts!
+    export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+    exec $d/debootstrap "\$@"
     EOF
-    chmod +x $t
+    chmod +x $out/bin/debootstrap
+
+    ensureDir $out/man/man8
+    mv debootstrap.8 $out/man/man8
   '';
-  */
+
+  passthru = {
+    inherit makedev;
+  };
 
   meta = { 
     description = "Tool to create a Debian system in a chroot";
diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index d80b35e1a111..1bf18ed867c3 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -1,13 +1,21 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, utillinux}:
 
-stdenv.mkDerivation {
-  name = "fakeroot-1.18.1";
+stdenv.mkDerivation rec {
+  name = "fakeroot-1.18.4";
 
   src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/f/fakeroot/fakeroot_1.18.1.orig.tar.bz2;
-    sha256 = "0h5jsw715a9hv32cb1m1bajy26l7xxrbgrk6qk1b6m91lxh6rnw9";
+    url = https://launchpad.net/ubuntu/+archive/primary/+files/fakeroot_1.18.4.orig.tar.bz2;
+    sha256 = "18mydrz49n7ic7147pikkpdb96x00s9wisdk6hrc75ll7vx9wd8a";
   };
 
+  buildInputs = [ utillinux /* provides getopt */ ];
+
+  postUnpack = ''
+    for prog in getopt; do
+      sed -i "s@getopt@$(type -p getopt)@g" ${name}/scripts/fakeroot.in
+    done
+  '';
+
   meta = {
     homepage = http://fakeroot.alioth.debian.org/;
     description = "Give a fake root environment through LD_PRELOAD";
-- 
cgit 1.4.1


From 267c54921f3a7dae0b3b200ab5c1c0f39001b0d2 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 17 Jul 2012 18:50:21 +0200
Subject: modemmanager: Update to 0.5.4.0

---
 pkgs/tools/networking/modemmanager/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/modemmanager/default.nix b/pkgs/tools/networking/modemmanager/default.nix
index c9c975d557c6..d3198cee32c7 100644
--- a/pkgs/tools/networking/modemmanager/default.nix
+++ b/pkgs/tools/networking/modemmanager/default.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
 
   src = fetchurl_gnome {
     project = "ModemManager";
-    major = "0"; minor = "5"; extension = "xz";
-    sha256 = "0zvwrni4l21d856nq28khigrhwgrq5cc7nh45zidwjj8q7bsxiz7";
+    major = "0"; minor = "5"; patchlevel = "4.0"; extension = "xz";
+    sha256 = "1fdf5d5cc494825afe9f551248e00a2d91e220e88435b47f109ca2a707a40f1f";
   };
 
   buildNativeInputs = [ intltool pkgconfig ];
-- 
cgit 1.4.1


From 42917c1c46b0a9a35392402f5219a04d6a867271 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Sep 2012 14:35:19 +0200
Subject: asymptote: update to version 2.18

---
 pkgs/tools/graphics/asymptote/src-for-default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/asymptote/src-for-default.nix b/pkgs/tools/graphics/asymptote/src-for-default.nix
index e9d822904afc..ddd0860ccd19 100644
--- a/pkgs/tools/graphics/asymptote/src-for-default.nix
+++ b/pkgs/tools/graphics/asymptote/src-for-default.nix
@@ -1,7 +1,7 @@
 rec {
-   version="2.16";
-   name="asymptote-2.16";
-   hash="1yj8dx320s1ypqbpb2116y4kkc8lwg5q4d49n992ds3g59w98djj";
+   version="2.18";
+   name="asymptote-2.18";
+   hash="0i7jm12lzj983gvpa95a85wxb4v4ksk3cxb0cq359x2kka0b6g5m";
    url="http://downloads.sourceforge.net/project/asymptote/${version}/asymptote-${version}.src.tgz";
-   advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.16/asymptote-2.16.src.tgz";
+   advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.18/asymptote-2.18.src.tgz";
 }
-- 
cgit 1.4.1


From 97d688b7872e5dc5730cee9e8b0a8497fb2f3fc1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 20 Sep 2012 14:35:30 +0200
Subject: asymptote: add myself as maintainer

---
 pkgs/tools/graphics/asymptote/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index bdde709c2c22..e9baac43cbdd 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -3,11 +3,11 @@ a @ {
   boehmgc,mesa,ncurses,readline,gsl,libsigsegv,
   python,zlib, perl, texLive, texinfo, lzma,
 
-  noDepEntry, fullDepEntry, fetchUrlFromSrcInfo, 
+  noDepEntry, fullDepEntry, fetchUrlFromSrcInfo,
   lib,
 
   ...}:
-let 
+let
   s = import ./src-for-default.nix;
   buildInputs = with a; [
     freeglut ghostscriptX imagemagick fftw boehmgc
@@ -54,8 +54,9 @@ rec {
     description = "A tool for programming graphics intended to replace Metapost";
     maintainers = [
       a.lib.maintainers.raskin
+      a.lib.maintainers.simons
     ];
-    platforms = with a.lib.platforms; 
+    platforms = with a.lib.platforms;
       linux;
   };
 }
-- 
cgit 1.4.1


From 656badd501cc58d87418d4e1aefcaae9ec692367 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Sep 2012 14:44:39 +0200
Subject: cabal-install: install bash-completion instructions

---
 pkgs/tools/package-management/cabal-install/0.14.0.nix | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/package-management/cabal-install/0.14.0.nix b/pkgs/tools/package-management/cabal-install/0.14.0.nix
index ecbd46de52c2..15fe5f1e22ce 100644
--- a/pkgs/tools/package-management/cabal-install/0.14.0.nix
+++ b/pkgs/tools/package-management/cabal-install/0.14.0.nix
@@ -9,6 +9,10 @@ cabal.mkDerivation (self: {
   buildDepends = [
     Cabal filepath HTTP mtl network random time zlib
   ];
+  postInstall = ''
+    mkdir $out/etc
+    mv bash-completion $out/etc/bash_completion.d
+  '';
   meta = {
     homepage = "http://www.haskell.org/cabal/";
     description = "The command-line interface for Cabal and Hackage";
-- 
cgit 1.4.1


From 63b87a116e1829d451240bf282d4a4ec89ff496e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 25 Sep 2012 15:35:54 +0200
Subject: hardlink: update to latest version

---
 pkgs/tools/system/hardlink/default.nix | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix
index 1655fdba6f47..192f7d871a1f 100644
--- a/pkgs/tools/system/hardlink/default.nix
+++ b/pkgs/tools/system/hardlink/default.nix
@@ -1,33 +1,27 @@
-{ fetchurl, stdenv }:
+{ fetchurl, stdenv, unzip }:
 
 let
-  rev = "269cc6";
-
-  src = fetchurl {
-    url = "http://pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=blob_plain;f=hardlink.c;hb=${rev}";
-    sha256 = "721c54e653772e11bf0d30fb02aa21b96b147a1b68c0acb4f05cb87e7718bc12";
-    name = "hardlink.c";
-  };
-
-  man =  fetchurl {
-    url = "pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=blob_plain;f=hardlink.1;hb=${rev}";
-    sha256 = "2f7e18a0259a2ceae316592e8b18bee525eb7e83fe3bb6b881e5dafa24747f2d";
-    name = "hardlink.1";
-  };
+  rev = "3ec908d539";
 in
 stdenv.mkDerivation {
-  name = "hardlink-2010.1.${rev}";
+  name = "hardlink-2012.9.${rev}";
 
-  phases = ["buildPhase"];
+  src = fetchurl {
+    url = "pkgs.fedoraproject.org/cgit/hardlink.git/snapshot/hardlink-${rev}.zip";
+    sha256 = "fea1803170b538d5fecf6a8d312ded1d25d516e9386a3797441a247487551647";
+    name = "hardlink-${rev}.zip";
+  };
 
-  buildPhase = ''
+  installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
-    gcc -O2 ${src} -o $out/bin/hardlink
-    install -m 444 ${man} $out/share/man/man1/hardlink.1
+    gcc -O2 hardlink.c -o $out/bin/hardlink
+    mv hardlink.1 $out/share/man/man1/hardlink.1
   '';
 
+  buildInputs = [ unzip ];
+
   meta = {
-    homepage = "http://pkgs.fedoraproject.org/gitweb/?p=hardlink.git;a=summary";
+    homepage = "http://pkgs.fedoraproject.org/cgit/hardlink.git/";
     description = "consolidate duplicate files via hardlinks";
     license = stdenv.lib.licenses.gpl2Plus;
 
-- 
cgit 1.4.1


From 1329ae018d82eda6a1c205e8cb52a138167ca874 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Tue, 25 Sep 2012 17:44:57 +0200
Subject: Bump plowshare version to git20120916

---
 pkgs/tools/misc/plowshare/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index 5e684cfa377f..d98dc33478aa 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchurl, makeWrapper, curl }:
 
-let
+stdenv.mkDerivation rec {
 
-  v  = "20120807";
+  name = "plowshare-${version}";
 
-in stdenv.mkDerivation {
-
-  name = "plowshare-git${v}";
+  version = "git20120916";
 
   src = fetchurl {
-    url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${v}.tar.gz";
-    sha256 = "0clryfssaa4rjvsy760p51ppq1275lwvhm9jh3g4mi973xv4n8si";
+    url = "http://plowshare.googlecode.com/files/plowshare-snapshot-${version}.tar.gz";
+    sha256 = "eccdb28d49ac47782abc8614202b3a88426cd587371641ecf2ec008880dc6067";
   };
 
   buildInputs = [ makeWrapper ];
-- 
cgit 1.4.1


From ad0b63265cb9b9446396dd5876d25fcb792d4f05 Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Mon, 24 Sep 2012 00:26:46 +0200
Subject: picocom: adding picocom, 1.7

---
 pkgs/tools/misc/picocom/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/misc/picocom/default.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/picocom/default.nix b/pkgs/tools/misc/picocom/default.nix
new file mode 100644
index 000000000000..bb08091ad57a
--- /dev/null
+++ b/pkgs/tools/misc/picocom/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "picocom-1.7";
+
+  src = fetchurl {
+    url = "http://picocom.googlecode.com/files/${name}.tar.gz";
+    sha256 = "17hjq713naq02xar711aw24qqd52p591mj1h5n97cni1ga7irwyh";
+  };
+
+  installPhase = ''
+    ensureDir $out/bin $out/share/man/man8
+    cp picocom $out/bin
+    cp picocom.8 $out/share/man/man8
+  '';
+
+  meta = {
+    description = "Minimal dumb-terminal emulation program";
+    homepage = http://code.google.com/p/picocom/;
+    license = "GPLv2+";
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb162c97f168..77fb3f4885cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7491,6 +7491,8 @@ let
 
   picard = callPackage ../applications/audio/picard { };
 
+  picocom = callPackage ../tools/misc/picocom { };
+
   pidgin = callPackage ../applications/networking/instant-messengers/pidgin {
     openssl = if (config.pidgin.openssl or true) then openssl else null;
     gnutls = if (config.pidgin.gnutls or false) then gnutls else null;
-- 
cgit 1.4.1


From 5ba1df3811b0e9c48c460ceef318bca02be247ab Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Tue, 25 Sep 2012 18:26:49 +0200
Subject: mosh: update to 1.2.2

---
 pkgs/tools/networking/mosh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix
index 60a9e5cab871..e5d9a656494e 100644
--- a/pkgs/tools/networking/mosh/default.nix
+++ b/pkgs/tools/networking/mosh/default.nix
@@ -2,11 +2,11 @@
 , makeWrapper, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mosh-1.1.3";
+  name = "mosh-1.2.2";
 
   src = fetchurl {
     url = "https://github.com/downloads/keithw/mosh/${name}.tar.gz";
-    sha256 = "1vkf7h8mcmfn9dgcwrww05mdijrl7321xv9wlhf7j99nwmklc8sk";
+    sha256 = "1763s6f398hmdgy73brpknwahnys28zk3pm37n66sr8iyz2cq8xp";
   };
 
   buildInputs = [ boost protobuf ncurses zlib pkgconfig IOTty makeWrapper perl ];
-- 
cgit 1.4.1


From 70ee9a6bb6f4f7ca8ef1dfbf2ad45d3b2b7e91bb Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 28 Sep 2012 17:02:19 +0200
Subject: aircrack-ng: updating hash

---
 pkgs/tools/networking/aircrack-ng/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
index 9ecaf183f1f6..ea4f517000a2 100644
--- a/pkgs/tools/networking/aircrack-ng/default.nix
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   src = fetchsvn {
     url = "http://trac.aircrack-ng.org/svn/trunk";
     inherit rev;
-    sha256 = "0rwj2nk4nyy0l9dg6rpg2h5gpvcygs5irj4i6fdcsr8xf0blq7yw";
+    sha256 = "d16fd3a4e918fd6a855c0d0ae0c863247a45189e6ec35c0c7082d3d07b6438db";
   };
 
   buildInputs = [libpcap openssl zlib];
-- 
cgit 1.4.1


From 46b05945e02fe9763b3f6a125b9ae8225c73475f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 28 Sep 2012 23:15:49 -0400
Subject: pciutils: Update to 3.1.10

Also update the pci.ids database.
---
 pkgs/tools/system/pciutils/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix
index 563521429a8e..3cab8b0ef104 100644
--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@@ -1,19 +1,19 @@
 { stdenv, fetchurl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "pciutils-3.1.7";
-  
+  name = "pciutils-3.1.10";
+
   src = fetchurl {
     url = "mirror://kernel/software/utils/pciutils/${name}.tar.bz2";
-    sha256 = "0i7mqf1fkmdqsawdk2badv6k3xrkryq0i2xknclvy6kcjsv27znq";
+    sha256 = "0xdahcxd00c921wnxi0f0w3lzjqdfphwa5vglfcpf0lv3l2w40pl";
   };
-  
+
   buildInputs = [ zlib ];
 
   pciids = fetchurl {
     # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
-    url = http://nixos.org/tarballs/pci.ids.20100714.bz2;
-    sha256 = "0vll4svr60l6217yna7bfhcjm3prxr2b62ynq4jaagdp1rilfbap";
+    url = http://nixos.org/tarballs/pci.ids.20120929.bz2;
+    sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb";
   };
 
   # Override broken auto-detect logic.
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
 
   installTargets = "install install-lib";
 
+  # Get rid of update-pciids as it won't work.
+  postInstall = "rm $out/sbin/update-pciids $out/man/man8/update-pciids.8";
+
   meta = {
     homepage = http://mj.ucw.cz/pciutils.shtml;
     description = "A collection of programs for inspecting and manipulating configuration of PCI devices";
-- 
cgit 1.4.1


From cbaf071944c60135c883838b3657b3f597d7e6b5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Oct 2012 20:41:08 +0200
Subject: youtube-dl: Update to version 2012.09.27.

As the current version doesn't work anymore and there has been a lot of progress
since February, I think it's time to switch over to the new versen.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index a810001d0ccf..1fc5c08042cb 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchgit, python}:
 
 let pkgname = "youtube-dl";
-    pkgver  = "2012.02.27";
+    pkgver  = "2012.09.27";
     
 in
 stdenv.mkDerivation {
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   src = fetchgit {
     url = "git://github.com/rg3/${pkgname}";
     rev = "refs/tags/${pkgver}";
-    sha256 = "17270ba14f42e8f2813bc6a0eb3674e51592eede69612e156e7d99a96fd147ce";
+    sha256 = "a98f3339301324ddd6620f7b1353abed807cd8dea5586d6901d7fe69bc6a397c";
   };
 
   buildInputs = [python];
-- 
cgit 1.4.1


From 38161b6c64045b961e93ec8730e707c2ea2e7ca2 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 2 Oct 2012 08:51:51 +0200
Subject: dosfstools: Add alternative URL, since main site seems to be down.

---
 pkgs/tools/filesystems/dosfstools/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/filesystems/dosfstools/default.nix b/pkgs/tools/filesystems/dosfstools/default.nix
index 21e2ceea9dd8..b0ee47e23b56 100644
--- a/pkgs/tools/filesystems/dosfstools/default.nix
+++ b/pkgs/tools/filesystems/dosfstools/default.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
   name = "dosfstools-3.0.11";
 
   src = fetchurl {
-    url = "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2";
+    urls = [
+      "http://www.daniel-baumann.ch/software/dosfstools/${name}.tar.bz2"
+      "http://pkgs.fedoraproject.org/repo/pkgs/dosfstools/${name}.tar.bz2/8d2211d5bd813164e20740e7c852aa06/${name}.tar.bz2"
+    ];
     sha256 = "1a6rzjy82f6579ywaln33g1wc7k8gbgjdss9q2q8daplac7pmcll";
   };
 
-- 
cgit 1.4.1


From dad7ea5a7e57666dfe5716317860a85877e31250 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 2 Oct 2012 11:18:59 +0400
Subject: Fix timidity source url

---
 pkgs/tools/misc/timidity/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index 4fae21250cac..89ff6f4677fc 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -7,7 +7,7 @@ composableDerivation.composableDerivation {} {
   name = "timidity-2.13.0";
 
   src = fetchurl {
-    url = http://ovh.dl.sourceforge.net/sourceforge/timidity/TiMidity++-2.13.0.tar.bz2;
+    url = mirror://sourceforge/timidity/TiMidity++-2.13.0.tar.bz2;
     sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf";
   };
 
-- 
cgit 1.4.1


From 24298db823714cbca08fcc69afcf589e6d43d582 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 4 Oct 2012 13:38:26 +0200
Subject: xdg-utils: Fix reference to /usr/bin/file in xdg-mime

---
 pkgs/tools/X11/xdg-utils/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index cc166ba20d99..df5d59c7b57c 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, file }:
 
 stdenv.mkDerivation rec {
   name = "xdg-utils-1.0.2";
@@ -7,6 +7,10 @@ stdenv.mkDerivation rec {
     url = "http://portland.freedesktop.org/download/${name}.tgz";
     sha256 = "1b019d3r1379b60p33d6z44kx589xjgga62ijz9vha95dg8vgbi1";
   };
+
+  postInstall = ''
+    substituteInPlace $out/bin/xdg-mime --replace /usr/bin/file ${file}/bin/file
+  '';
   
   meta = {
     homepage = http://portland.freedesktop.org/wiki/;
-- 
cgit 1.4.1


From e8c4748cdba536f6c85e47dea207205795b4c4de Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Oct 2012 16:06:19 -0400
Subject: cabextract: Update to 1.4

---
 pkgs/tools/archivers/cabextract/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/archivers/cabextract/default.nix b/pkgs/tools/archivers/cabextract/default.nix
index 9e11a1bf761e..79be818bfb39 100644
--- a/pkgs/tools/archivers/cabextract/default.nix
+++ b/pkgs/tools/archivers/cabextract/default.nix
@@ -1,10 +1,11 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "cabextract-1.3";
+  name = "cabextract-1.4";
+
   src = fetchurl {
-    url = meta.homepage + name + ".tar.gz";
-    sha256 = "00f0qcrz9f2gwvm98qglbrjpwrzwrfdgh0hck6im93dl6lx3hr6l";
+    url = "http://www.cabextract.org.uk/${name}.tar.gz";
+    sha256 = "07p49053a727nwnw7vnx1bpj4xqa43cvx8mads2146fpqai8pfpp";
   };
 
   meta = {
-- 
cgit 1.4.1


From d9c01ef51d5dd9ed9ce26de19ff94c0b2f70d243 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 5 Oct 2012 16:06:35 -0400
Subject: p7zip: Update to 9.20.1

---
 pkgs/tools/archivers/p7zip/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/archivers/p7zip/default.nix b/pkgs/tools/archivers/p7zip/default.nix
index bb9743e8e5d9..767e85d67733 100644
--- a/pkgs/tools/archivers/p7zip/default.nix
+++ b/pkgs/tools/archivers/p7zip/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "p7zip-9.13";
+  name = "p7zip-9.20.1";
   
   src = fetchurl {
-    url = mirror://sourceforge/p7zip/p7zip_9.13_src_all.tar.bz2;
-    sha256 = "08yr0cfbjx60r1ia7vhphzvc3gax62xhgsn3vdm7sdmxxai0z77w";
+    url = mirror://sourceforge/p7zip/p7zip_9.20.1_src_all.tar.bz2;
+    sha256 = "10j7rc1nzdp7vvcpc3340yi3qw7abby4szv8zkwh10d0zizpwma9";
   };
 
   preConfigure =
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
       buildFlags=all3
     '';
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://p7zip.sourceforge.net/;
     description = "A port of the 7-zip archiver";
-- 
cgit 1.4.1


From 749cc2bf1e1a25d4b53d1f50450da130a4bfaee5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 7 Oct 2012 18:02:46 +0400
Subject: Adding Debian devscripts. Mostly for uscan.

I plan to later use uscan for simplifying package updates in some
NixPkgs packages. I have no code for that now.

I added Perl packages File::DesktopEntry and File::BaseDir in a slightly
hascky way because one part of the installation system replaced PREFIX=
with --prefix= and the other complained that it doesn't know what to do
with --prefix=. I checked that a script using File::DesktopEntry works,
and I don't know enough Perl to rewrite buildPerlPackage and hope that
my change is an improvement.

I removed trnaslated manpages because it uses po4a which has some more
Debian-specific dependencies of its own.
---
 pkgs/tools/misc/debian-devscripts/default.nix  | 34 ++++++++++++++++++++++++++
 pkgs/tools/package-management/dpkg/default.nix | 17 +++++++------
 pkgs/top-level/all-packages.nix                |  4 +++
 pkgs/top-level/perl-packages.nix               | 27 ++++++++++++++++++++
 4 files changed, 74 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/tools/misc/debian-devscripts/default.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
new file mode 100644
index 000000000000..693cf7c78bfe
--- /dev/null
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl, perl, CryptSSLeay, LWP, unzip, xz, dpkg, TimeDate, DBFile
+  , FileDesktopEntry, libxslt, docbook_xsl, python, setuptools, makeWrapper
+}:
+stdenv.mkDerivation rec {
+  version = "2.12.4";
+  name = "debian-devscripts-${version}";
+  src = fetchurl {
+    url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.gz";
+    sha256 = "34bcbec78bd4fe34d9f1326b9d1477ff2410e20e2dca6b7bfbf2bf92dbb83904";
+  };
+  buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 
+    FileDesktopEntry libxslt python setuptools makeWrapper ];
+  preConfigure = ''
+    export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}";
+    sed -e "s@/usr/share/sgml/[^ ]*/manpages/docbook.xsl@${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl@" -i scripts/Makefile
+    sed -e 's/ translated_manpages//; s/--install-layout=deb//; s@--root="[^ ]*"@--prefix="'"$out"'"@' -i Makefile */Makefile
+    tgtpy="$out/lib/${python.libPrefix}/site-packages"
+    mkdir -p "$tgtpy"
+    export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy"
+    sed -re "s@/usr( |$|/)@$out\\1@" -i Makefile* */Makefile*
+    sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile*
+  '';
+  postInstall = ''
+    for i in "$out/bin"/*; do
+      wrapProgram "$i" \
+        --prefix PERL5LIB : "$PERL5LIB" \
+        --prefix PERL5LIB : "$out/share/devscripts"
+    done
+  '';
+  meta = {
+    description = ''Debian package maintenance scripts'';
+    license = "GPL (variuous)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only...
+  };
+}
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 2ffacb084793..95682df5d39c 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,16 +1,16 @@
-{stdenv, fetchurl, perl, zlib, bzip2}:
+{stdenv, fetchurl, perl, zlib, bzip2, xz}:
 
-let version = "1.14.29"; in
+let version = "1.16.8"; in
 
 stdenv.mkDerivation {
   name = "dpkg-${version}";
 
   src = fetchurl {
-    url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.gz";
-    sha256 = "0cynms4vziy957r4zskybbid87sz99vrfy8d999vlhxgc74c2zpa";
+    url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
+    sha256 = "4a1f4611390d93f1f198d910d3a4e4913b3cf81702b31f585a1872ca98df0eaa";
   };
 
-  configureFlags = "--without-dselect --with-admindir=/var/lib/dpkg";
+  configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg ";
 
   preConfigure = ''
     # Can't use substitute pending resolution of NIXPKGS-89.
@@ -24,11 +24,12 @@ stdenv.mkDerivation {
     chmod +x $TMPDIR/dpkg
     PATH=$TMPDIR:$PATH
 
-    substituteInPlace src/Makefile.in --replace "install-data-local:" "disabled:"
-    substituteInPlace dpkg-split/Makefile.in --replace "install-data-local:" "disabled:"
+    for i in $(find . -name Makefile.in); do 
+      substituteInPlace $i --replace "install-data-local:" "disabled:" ;
+    done
   '';
 
-  buildInputs = [ perl zlib bzip2 ];
+  buildInputs = [ perl zlib bzip2 xz ];
 
   meta = {
     description = "The Debian package manager";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57078ac3750c..32fb0cb46753 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -587,6 +587,10 @@ let
 
   dcraw = callPackage ../tools/graphics/dcraw { };
 
+  debian_devscripts = callPackage ../tools/misc/debian-devscripts {
+    inherit (perlPackages) CryptSSLeay LWP TimeDate DBFile FileDesktopEntry;
+  };
+
   debootstrap = callPackage ../tools/misc/debootstrap { };
 
   detox = callPackage ../tools/misc/detox { };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index eeba996990dc..0e1f11d0b8ae 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1578,6 +1578,19 @@ rec {
     };
   };
 
+  FileBaseDir = buildPerlPackage rec {
+    version = "0.03";
+    name = "File-BaseDir-${version}";
+    configurePhase = ''
+      preConfigure || true
+      perl Build.PL PREFIX="$out" prefix="$out"
+    '';
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
+      sha256 = "0029cba7a3b5d8aa5f7d03cb1b7ba2bcf2829382f7f26aa3bee06fce8611a886";
+    };
+  };
+
   FileCopyRecursive = buildPerlPackage rec {
     name = "File-Copy-Recursive-0.38";
     src = fetchurl {
@@ -1586,6 +1599,20 @@ rec {
     };
   };
 
+  FileDesktopEntry = buildPerlPackage rec {
+    version = "0.04";
+    name = "File-DesktopEntry-${version}";
+    configurePhase = ''
+      preConfigure || true
+      perl Build.PL PREFIX="$out" prefix="$out"
+    '';
+    src = fetchurl {
+      url = "mirror://cpan/modules/by-module/File/${name}.tar.gz";
+      sha256 = "d7f80d8bd303651a43dc1810c73740d38a0d2b158fb33cd3b6ca4d3a566da7cb";
+    };
+    propagatedBuildInputs = [ FileBaseDir ];
+  };
+
   FileFindRule = buildPerlPackage rec {
     name = "File-Find-Rule-0.32";
     src = fetchurl {
-- 
cgit 1.4.1


From 4454e45955e665f955e1176541bb8d195dfcb40c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 7 Oct 2012 19:21:35 +0400
Subject: Adding meta.maintainers

---
 pkgs/tools/misc/debian-devscripts/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 693cf7c78bfe..e8a8abea91dc 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
   '';
   meta = {
     description = ''Debian package maintenance scripts'';
-    license = "GPL (variuous)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only...
+    license = "GPL (various)"; # Mix of public domain, Artistic+GPL, GPL1+, GPL2+, GPL3+, and GPL2-only...
+    maintainers = with stdenv.lib.maintainers; [raskin];
   };
 }
-- 
cgit 1.4.1


From d72adde5307cb26f0c307575b8a58189d49bd9c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 7 Oct 2012 00:25:38 -0400
Subject: Add nss-myhostname

---
 pkgs/tools/networking/nss-myhostname/default.nix      | 19 +++++++++++++++++++
 .../nss-myhostname/ignore-ipv6-link-local.patch       | 13 +++++++++++++
 .../networking/nss-myhostname/nscd-segfault.patch     | 15 +++++++++++++++
 pkgs/top-level/all-packages.nix                       |  2 ++
 4 files changed, 49 insertions(+)
 create mode 100644 pkgs/tools/networking/nss-myhostname/default.nix
 create mode 100644 pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch
 create mode 100644 pkgs/tools/networking/nss-myhostname/nscd-segfault.patch

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/nss-myhostname/default.nix b/pkgs/tools/networking/nss-myhostname/default.nix
new file mode 100644
index 000000000000..80296b0d992c
--- /dev/null
+++ b/pkgs/tools/networking/nss-myhostname/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "nss-myhostname-0.3";
+
+  src = fetchurl {
+    url = "http://0pointer.de/lennart/projects/nss-myhostname/${name}.tar.gz";
+    sha256 = "1wnawxklsv3z796l752j7a21gvj2615fk12qr1bir3apipm499rb";
+  };
+
+  patches = [ ./nscd-segfault.patch ./ignore-ipv6-link-local.patch ];
+
+  meta = {
+    description = "Name Service Switch module ensuring that the hostname always resolves to a valid address";
+    homepage = http://0pointer.de/lennart/projects/nss-myhostname/;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch b/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch
new file mode 100644
index 000000000000..396bb2e10ccd
--- /dev/null
+++ b/pkgs/tools/networking/nss-myhostname/ignore-ipv6-link-local.patch
@@ -0,0 +1,13 @@
+--- nss-myhostname-0.3/netlink.c	2011-05-09 08:56:34.344579140 -0400
++++ nss-myhostname-0.3-new/netlink.c	2012-10-06 23:52:10.577755588 -0400
+@@ -179,6 +179,10 @@
+                             ifaddrmsg->ifa_scope == RT_SCOPE_NOWHERE)
+                                 continue;
+ 
++                        if (ifaddrmsg->ifa_family == AF_INET6 &&
++                            ifaddrmsg->ifa_scope == RT_SCOPE_LINK)
++                                continue;
++
+                         if (ifaddrmsg->ifa_flags & IFA_F_DEPRECATED)
+                                 continue;
+ 
diff --git a/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch b/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch
new file mode 100644
index 000000000000..a2947461c87d
--- /dev/null
+++ b/pkgs/tools/networking/nss-myhostname/nscd-segfault.patch
@@ -0,0 +1,15 @@
+--- nss-myhostname-0.3/nss-myhostname.c	2011-05-09 09:01:27.421581560 -0400
++++ nss-myhostname-0.3-new/nss-myhostname.c	2012-10-06 23:40:09.836894004 -0400
+@@ -177,7 +177,11 @@
+         /* Verify the size matches */
+         assert(idx == ms);
+ 
+-        *pat = r_tuple_prev;
++        /* Nscd expects us to store the first record in **pat. */
++        if (*pat)
++                **pat = *r_tuple_prev;
++        else
++                *pat = r_tuple_prev;
+ 
+         if (ttlp)
+                 *ttlp = 0;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28848c191689..5a5fc5e2fb8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1165,6 +1165,8 @@ let
     inherit (pythonPackages) pysqlite;
   };
 
+  nss_myhostname = callPackage ../tools/networking/nss-myhostname {};
+
   nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {};
 
   ntfs3g = callPackage ../tools/filesystems/ntfs-3g { };
-- 
cgit 1.4.1


From 026dd8b6f226386c489f53f9313f9445ac4dd721 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sun, 7 Oct 2012 16:54:02 -0400
Subject: rEFInd: 0.4.5

---
 pkgs/tools/misc/refind/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/refind/default.nix b/pkgs/tools/misc/refind/default.nix
index bd0a7040adff..1fbb177afa06 100644
--- a/pkgs/tools/misc/refind/default.nix
+++ b/pkgs/tools/misc/refind/default.nix
@@ -1,22 +1,22 @@
 { stdenv, fetchurl, gnu_efi, unzip }:
 
-let version = "0.2.3"; in
+let version = "0.4.5"; in
 
 stdenv.mkDerivation {
   name = "refind-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/refind/refind-src-${version}.zip";
-    sha256 = "0q3p4mczr6wchk4vbgsb0cq7829vk3b3kg9qaizrb02pdak3s2nf";
+    sha256 = "05nbalsl5csgph0v2amzgay9k2vzm47z8n1n6blbh9hvb7j5vn2c";
   };
 
   buildInputs = [ unzip ];
 
-  buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" ];
+  buildFlags = [ "prefix=" "EFIINC=${gnu_efi}/include/efi" "GNUEFILIB=${gnu_efi}/lib" "EFILIB=${gnu_efi}/lib" "EFICRT0=${gnu_efi}/lib" "LOCAL_CFLAGS=-I${gnu_efi}/include" ];
 
   installPhase = ''
     mkdir -pv $out
-    install -v -m644 refind/refind.efi refind.conf-sample $out
+    install -v -m644 refind/refind*.efi refind.conf-sample $out
     mv -v icons $out
   '';
 
-- 
cgit 1.4.1


From 18ccd4b34073dd981babab7436becf51100f4e2f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Oct 2012 10:46:10 +0200
Subject: haskell-cabal-install: add version 1.16.0

---
 .../package-management/cabal-install/1.16.0.nix    | 23 ++++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  5 +++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/tools/package-management/cabal-install/1.16.0.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.nix b/pkgs/tools/package-management/cabal-install/1.16.0.nix
new file mode 100644
index 000000000000..7c977989471e
--- /dev/null
+++ b/pkgs/tools/package-management/cabal-install/1.16.0.nix
@@ -0,0 +1,23 @@
+{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-install";
+  version = "1.16.0";
+  sha256 = "0yg8h028sixvzx42v1spjyx4qfhpsar38cvz9188m62rac8ak8az";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    Cabal filepath HTTP mtl network random time zlib
+  ];
+  postInstall = ''
+    mkdir $out/etc
+    mv bash-completion $out/etc/bash_completion.d
+  '';
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "The command-line interface for Cabal and Hackage";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 16d315056ea5..10f3238b2232 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -143,7 +143,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     transformers = self.transformers_0_3_0_0;   # 7.6 ok
     xhtml        = self.xhtml_3000_2_1;         # 7.6 ok
     zlib         = self.zlib_0_5_4_0;           # 7.6 ok
-    cabalInstall = self.cabalInstall_0_14_0;    # 7.6 ok
+    cabalInstall = self.cabalInstall_1_16_0;    # 7.6 ok
     alex         = self.alex_3_0_1;             # 7.6 ok
     haddock      = self.haddock_2_12_0;         # 7.6 ok
     happy        = self.happy_1_18_10;          # 7.6 ok
@@ -1889,7 +1889,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cabalInstall_0_8_2  = callPackage ../tools/package-management/cabal-install/0.8.2.nix  {};
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
-  cabalInstall = self.cabalInstall_0_14_0;
+  cabalInstall_1_16_0 = callPackage ../tools/package-management/cabal-install/1.16.0.nix {};
+  cabalInstall = self.cabalInstall_1_16_0;
 
   jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {};
 
-- 
cgit 1.4.1


From 58afd436155c7e49a9096d6a70320e6d98603b77 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 8 Oct 2012 12:35:25 +0200
Subject: obnam: Update to version 1.2. Also update its dependencies (python
 libraries)

---
 pkgs/tools/backup/obnam/default.nix |  6 +++---
 pkgs/top-level/python-packages.nix  | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index 119633e06387..07b86c2e41ed 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, python, pythonPackages, pycrypto, attr }:
 
 pythonPackages.buildPythonPackage {
-  name = "obnam-1.1";
+  name = "obnam-1.2";
   namePrefix = "";
 
   src = fetchurl rec {
-    url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.1.orig.tar.gz";
-    sha256 = "763693e5ea4e8d6a63b1a16c2aacd5fe0dc97abc687c8f0dde5840f77d549349";
+    url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_1.2.orig.tar.gz";
+    sha256 = "33457452726d5c393d98c565b8e1ab3ac11276cc42bf67c4eee6c4e4ac9976d6";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e7ce262649e3..f511b64ceda3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3120,11 +3120,11 @@ let pythonPackages = python.modules // rec {
   };
 
   cliapp = buildPythonPackage rec {
-    name = "cliapp-1.20120630";
+    name = "cliapp-1.20120929";
 
     src = fetchurl rec {
-      url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20120630.orig.tar.gz";
-      sha256 = "6beeb1fb3077561540094584ce36055266ac67b80f158b9b82fe4075096f4716";
+      url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_1.20120929.orig.tar.gz";
+      sha256 = "30d5077e53b3e45f892b1c49feaaf4f47e4664400ed71435e77a82a2b823a0f8";
     };
 
     buildInputs = [ sphinx ];
@@ -3140,11 +3140,11 @@ let pythonPackages = python.modules // rec {
   };
 
   tracing = buildPythonPackage rec {
-    name = "tracing-0.6";
+    name = "tracing-0.7";
 
     src = fetchurl rec {
-      url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.6.orig.tar.gz";
-      sha256 = "1164cf05891f9bca93fb87413f32d2c4da90348adbf69b0ad36a464b7adcd354";
+      url = "http://code.liw.fi/debian/pool/main/p/python-tracing/python-tracing_0.7.orig.tar.gz";
+      sha256 = "9954a1b0cc6b957d15975b048f929bbdd46766d397a6fa51bf8f6498b9459276";
     };
 
     buildInputs = [ sphinx ];
@@ -3160,11 +3160,11 @@ let pythonPackages = python.modules // rec {
   };
 
   ttystatus = buildPythonPackage rec {
-    name = "ttystatus-0.19";
+    name = "ttystatus-0.21";
 
     src = fetchurl rec {
-      url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.19.orig.tar.gz";
-      sha256 = "7cc112a4783f2e0c354c5244f8e50b18733b5957677b56a755c1016e04c0c28d";
+      url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_0.21.orig.tar.gz";
+      sha256 = "4a1f3a41c9bd3b5d2bd8e6f093890857301e590aa1d428fc9a6dca591227244c";
     };
 
     buildInputs = [ sphinx ];
@@ -3180,11 +3180,11 @@ let pythonPackages = python.modules // rec {
   };
 
   larch = buildPythonPackage rec {
-    name = "larch-1.20120527";
+    name = "larch-1.20121006";
 
     src = fetchurl rec {
-      url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20120527.orig.tar.gz";
-      sha256 = "2865a1bfa6bd276bf746e8e7cb73d5199d0b6d00045d8c92e158626687d3bbe1";
+      url = "http://code.liw.fi/debian/pool/main/p/python-larch/python-larch_1.20121006.orig.tar.gz";
+      sha256 = "b4482981010e9c22ee3fce6fdc664b8fc0a1a3a18ed30b40f247f3b44437ccfa";
     };
 
     buildInputs = [ sphinx ];
-- 
cgit 1.4.1


From 18c0bca167484f2b30e8d5df4047edc27f12d5d1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Tue, 9 Oct 2012 11:02:06 +0400
Subject: Fix some of the debian-devscripts shell references

---
 pkgs/tools/misc/debian-devscripts/default.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index e8a8abea91dc..ddf30f342d15 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     sed -re "s@/etc( |$|/)@$out/etc\\1@" -i Makefile* */Makefile*
   '';
   postInstall = ''
+    sed -re 's@(^|[ !`"])/bin/bash@\1${stdenv.shell}@g' -i "$out/bin"/*
     for i in "$out/bin"/*; do
       wrapProgram "$i" \
         --prefix PERL5LIB : "$PERL5LIB" \
-- 
cgit 1.4.1


From 10462c7a820e9c4e34a3b618c8b3383aacb0888e Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 9 Oct 2012 14:08:17 +0200
Subject: btrfsprogs: upgrade to current version (0.20 pre)

---
 pkgs/tools/filesystems/btrfsprogs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix
index 861bacd46c2a..4c1963f46332 100644
--- a/pkgs/tools/filesystems/btrfsprogs/default.nix
+++ b/pkgs/tools/filesystems/btrfsprogs/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchgit, zlib, libuuid, acl, attr, e2fsprogs }:
 
-let version = "0.19-20120328"; in
+let version = "0.20pre20121005"; in
 
 stdenv.mkDerivation {
   name = "btrfs-progs-${version}";
 
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-progs.git";
-    rev = "1957076ab4fefa47b6efed3da541bc974c83eed7";
-    sha256 = "566d863c5500652e999d0d6b823365fb06f2f8f9523e65e69eaa3e993e9b26e1";
+    rev = "91d9eec1ff044394f2b98ee7fcb76713dd33b994";
+    sha256 = "72d4cd4fb23d876a17146d6231ad40a2151fa47c648485c54cf7478239b43764";
   };
 
   buildInputs = [ zlib libuuid acl attr e2fsprogs ];
-- 
cgit 1.4.1


From 29d3112ee9591645d58f6be48fb2982386488302 Mon Sep 17 00:00:00 2001
From: Alexander Foremny <alexanderforemny@gmail.com>
Date: Sat, 6 Oct 2012 12:42:09 +0200
Subject: Rename plowshare-git to plowshare

---
 pkgs/tools/misc/plowshare/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/plowshare/default.nix b/pkgs/tools/misc/plowshare/default.nix
index d98dc33478aa..4634585cbd26 100644
--- a/pkgs/tools/misc/plowshare/default.nix
+++ b/pkgs/tools/misc/plowshare/default.nix
@@ -4,10 +4,10 @@ stdenv.mkDerivation rec {
 
   name = "plowshare-${version}";
 
-  version = "git20120916";
+  version = "20120916";
 
   src = fetchurl {
-    url = "http://plowshare.googlecode.com/files/plowshare-snapshot-${version}.tar.gz";
+    url = "http://plowshare.googlecode.com/files/plowshare-snapshot-git${version}.tar.gz";
     sha256 = "eccdb28d49ac47782abc8614202b3a88426cd587371641ecf2ec008880dc6067";
   };
 
-- 
cgit 1.4.1


From 8f662e0663c5f96f7a132523b7a43b9f95d52bc3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Oct 2012 19:25:10 +0200
Subject: asymptote: update to version 2.20

---
 pkgs/tools/graphics/asymptote/src-for-default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/asymptote/src-for-default.nix b/pkgs/tools/graphics/asymptote/src-for-default.nix
index ddd0860ccd19..277393283abb 100644
--- a/pkgs/tools/graphics/asymptote/src-for-default.nix
+++ b/pkgs/tools/graphics/asymptote/src-for-default.nix
@@ -1,7 +1,7 @@
 rec {
-   version="2.18";
-   name="asymptote-2.18";
-   hash="0i7jm12lzj983gvpa95a85wxb4v4ksk3cxb0cq359x2kka0b6g5m";
+   version="2.20";
+   name="asymptote-2.20";
+   hash="0ji45v0d9jps8clsl86pvmr22acci3f0ciicmyzak6dbczqyrj80";
    url="http://downloads.sourceforge.net/project/asymptote/${version}/asymptote-${version}.src.tgz";
-   advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.18/asymptote-2.18.src.tgz";
+   advertisedUrl="http://downloads.sourceforge.net/project/asymptote/2.20/asymptote-2.20.src.tgz";
 }
-- 
cgit 1.4.1


From 6ef73f57c308cb11a98f2d56bee46e491a4e87a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Oct 2012 19:26:02 +0200
Subject: smartmontools: update to version 6.0

---
 pkgs/tools/system/smartmontools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index b79e92b52370..2f93f18ade59 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -7,14 +7,14 @@ let
   };
 in
 stdenv.mkDerivation rec {
-  name = "smartmontools-5.43";
+  name = "smartmontools-6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smartmontools/${name}.tar.gz";
-    sha256 = "d845187d1500b87ef8d2c43772bd0218a59114fe58474a903c56777c9175351e";
+    sha256 = "9fe4ff2b7bcd00fde19db82bba168f5462ed6e857d3ef439495e304e3231d3a6";
   };
 
-  patchPhase = "cp ${driverdb} drivedb.h";
+  # patchPhase = "cp ${driverdb} drivedb.h";
 
   meta = {
     description = "Tools for monitoring the health of hard drivers";
-- 
cgit 1.4.1


From 7b40d67d618ab80200380d8c219bae519c289155 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 11 Oct 2012 06:11:49 +0200
Subject: adding taskwarrior

---
 pkgs/tools/misc/task/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/misc/task/default.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/task/default.nix b/pkgs/tools/misc/task/default.nix
new file mode 100644
index 000000000000..529eacd377ed
--- /dev/null
+++ b/pkgs/tools/misc/task/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, cmake}:
+
+stdenv.mkDerivation {
+  name = "task-2.1.2";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
+    sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
+  };
+
+  buildInputs = [ cmake ];
+
+  meta = {
+    description = "GTD (getting things done) implementation";
+    homepage = http://taskwarrior.org;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 504e64523944..1b9eca5e07cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1525,6 +1525,8 @@ let
     autoconf = autoconf213;
   };
 
+  task = callPackage ../tools/misc/task { };
+
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
   /*
-- 
cgit 1.4.1


From 0bf1789b6a64f8654325412de2a1a40c7834f6ba Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 11 Oct 2012 10:50:53 +0400
Subject: Use newly-added taskwarrior as an update to existing taskwarrior
 attribute

---
 pkgs/applications/misc/taskwarrior/default.nix | 31 ++++++++++----------------
 pkgs/tools/misc/task/default.nix               | 22 ------------------
 pkgs/top-level/all-packages.nix                |  2 --
 3 files changed, 12 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/tools/misc/task/default.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 95f9de2f42b8..dbb3c3f6a4ed 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -1,29 +1,22 @@
-{ stdenv, fetchurl, cmake, lua5 }:
+{stdenv, fetchurl, cmake}:
 
 stdenv.mkDerivation {
-  name = "task-warrior-2.0.0";
+  name = "taskwarrior-2.1.2";
 
-  src = fetchurl {
-    url = http://www.taskwarrior.org/download/task-2.0.0.tar.gz;
-    sha256 = "1gbmcynj2n2c9dcykxn27ffk034mvm0zri5hqhfdx593dhv1x5vq";
-  };
-
-  NIX_LDFLAGS = "-ldl";
-
-  buildNativeInputs = [ cmake ];
-  buildInputs = [ lua5 ];
+  enableParallelBuilding = true;
 
-  crossAttrs = {
-    preConfigure = ''
-      export NIX_CROSS_LDFLAGS="$NIX_CROSS_LDFLAGS -ldl"
-    '';
+  src = fetchurl {
+    url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
+    sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
   };
 
-  enableParallelBuilding = true;
+  buildInputs = [ cmake ];
 
   meta = {
-    description = "Command-line todo list manager";
-    homepage = http://taskwarrior.org/;
-    license = "GPLv2+";
+    description = "GTD (getting things done) implementation";
+    homepage = http://taskwarrior.org;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [stdenv.lib.maintainers.marcweber];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/task/default.nix b/pkgs/tools/misc/task/default.nix
deleted file mode 100644
index 529eacd377ed..000000000000
--- a/pkgs/tools/misc/task/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{stdenv, fetchurl, cmake}:
-
-stdenv.mkDerivation {
-  name = "task-2.1.2";
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-    url = http://www.taskwarrior.org/download/task-2.1.2.tar.gz;
-    sha256 = "0diy72sgiyvfl6bdy7k3qwv3ijx2z1y477smkk6jsbbd9fsp2lfg";
-  };
-
-  buildInputs = [ cmake ];
-
-  meta = {
-    description = "GTD (getting things done) implementation";
-    homepage = http://taskwarrior.org;
-    license = stdenv.lib.licenses.mit;
-    maintainers = [stdenv.lib.maintainers.marcweber];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f855a2ab34d..caedbfdb783f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1525,8 +1525,6 @@ let
     autoconf = autoconf213;
   };
 
-  task = callPackage ../tools/misc/task { };
-
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
   /*
-- 
cgit 1.4.1


From 74196058eeb32f655ea0cdafe40f9b601bcf213d Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Fri, 12 Oct 2012 00:45:42 +0000
Subject: added gsmartcontrol 0.8.7 to nixpkgs

---
 pkgs/tools/misc/gsmartcontrol/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  6 +++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/misc/gsmartcontrol/default.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix
new file mode 100644
index 000000000000..60003b3b5d53
--- /dev/null
+++ b/pkgs/tools/misc/gsmartcontrol/default.nix
@@ -0,0 +1,23 @@
+{ fetchurl, stdenv, smartmontools, gtk, gtkmm, libglademm, pkgconfig, pcre }:
+
+stdenv.mkDerivation rec {
+  version="0.8.7";
+  name = "gsmartcontrol";
+
+  src = fetchurl {
+    url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
+    sha256 = "1ipykzqpfvlr84j38hr7q2cag4imrn1gql10slp8bfrs4h1si3vh";
+  };
+
+  buildInputs = [ smartmontools gtk gtkmm libglademm pkgconfig pcre ];
+
+  #installTargets = "install datainstall";
+
+  meta = {
+    description = "GSmartControl is a graphical user interface for smartctl (from smartmontools package), which is a tool for querying and controlling SMART (Self-Monitoring, Analysis, and Reporting Technology) data on modern hard disk drives.";
+    homepage = http://gsmartcontrol.berlios.de;
+    license = "GPLv2+";
+    maintainers = with stdenv.lib.maintainers; [qknight];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fc5b67f67457..fa88d4b5bc30 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8145,8 +8145,12 @@ let
     inherit (gnome) gnomedocutils;
   };
 
-  gtypist = callPackage ../games/gtypist { };
+  gsmartcontrol = callPackage ../tools/misc/gsmartcontrol {
+    inherit (gnome) libglademm;
+  };
 
+  gtypist = callPackage ../games/gtypist { };
+ 
   hexen = callPackage ../games/hexen { };
 
   icbm3d = callPackage ../games/icbm3d { };
-- 
cgit 1.4.1


From 84c18a97e475dd5b658653675660b9cb4c2b5f5b Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Fri, 12 Oct 2012 15:40:04 +0200
Subject: testdisk: updating to 6.13

I fixed the licence field to GPLv2+ too
---
 pkgs/tools/misc/testdisk/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix
index fd9f45782940..6ccfea50482b 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/pkgs/tools/misc/testdisk/default.nix
@@ -1,18 +1,18 @@
-{stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl}:
+{stdenv, fetchurl, ncurses, libjpeg, e2fsprogs, zlib, openssl, libuuid}:
 
 stdenv.mkDerivation {
-  name = "testdisk-6.8";
+  name = "testdisk-6.13";
   
   src = fetchurl {
-    url = http://www.cgsecurity.org/testdisk-6.8.tar.bz2;
-    sha256 = "0cyqikcyi6zj671kkr8vydqskh2r7f3n1v3xks1vh1biaffqq2ir";
+    url = http://www.cgsecurity.org/testdisk-6.13.tar.bz2;
+    sha256 = "087jrn41z3ymf1b6njl2bg99pr79v8l1f63f7rn5ni69vz6mq9s8";
   };
 
-  buildInputs = [ncurses libjpeg e2fsprogs zlib openssl];
+  buildInputs = [ncurses libjpeg e2fsprogs zlib openssl libuuid];
 
   meta = {
     homepage = http://www.cgsecurity.org/wiki/TestDisk;
-    license = "GPL";
+    license = "GPLv2+";
     longDescription = ''
       TestDisk is a program for data recovery, primarily designed to
       help recover lost partitions and/or make non-booting disks
-- 
cgit 1.4.1


From e9f0cae00f48a253d1975752b6811ee8ba97f226 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 13 Oct 2012 18:34:31 +0200
Subject: miniupnpd: upgrade to 1.7.20121005

---
 pkgs/tools/networking/miniupnpd/default.nix | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 6db47f8e079f..b5002d229903 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,33 +1,34 @@
-{ stdenv, fetchurl, iptables }:
+{ stdenv, fetchurl, iptables, libnfnetlink, libnetfilter_conntrack }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.4";
+  name = "miniupnpd-1.7.20121005";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "06q5agkzv2snjxcsszpm27h8bqv41jijahs8jqnarxdrik97rfl5";
+    sha256 = "03kaxj808hgj1zf2528pzilgywgh70mh0qivjb5nm3spziiq32sv";
   };
 
-  buildInputs = [ iptables ];
+  buildInputs = [ iptables libnfnetlink libnetfilter_conntrack ];
+
+  patchPhase = ''
+    sed -i -e 's/upnputils\.o -lnfnetlink/upnputils.o/' Makefile.linux
+  '';
 
   NIX_CFLAGS_COMPILE = "-DIPTABLES_143";
 
-  NIX_CFLAGS_LINK = "-liptc";
-  
+  NIX_CFLAGS_LINK = "-liptc -lnfnetlink";
+
   makefile = "Makefile.linux";
 
   makeFlags = "LIBS=";
 
-  postBuild = "cat config.h";
-
   installFlags = "PREFIX=$(out) INSTALLPREFIX=$(out)";
 
-  postInstall =
+  preInstall =
     ''
-      mkdir -p $out/share/man/man1
-      cp miniupnpd.1 $out/share/man/man1/
+      mkdir -p $out/share/man/man8
     '';
 
   meta = {
-- 
cgit 1.4.1


From 06bdd77d3db484b755dfec605a6bba80a87e4da1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Oct 2012 19:09:02 +0200
Subject: grub-2.0: fix bash completion script

---
 pkgs/tools/misc/grub/2.0x.nix                  |  2 ++
 pkgs/tools/misc/grub/fix-bash-completion.patch | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/tools/misc/grub/fix-bash-completion.patch

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 4186a4405353..5006d8f4f4a5 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -51,6 +51,8 @@ stdenv.mkDerivation rec {
            -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g"
     '';
 
+  patches = [ ./fix-bash-completion.patch ];
+
   configureFlags =
     let arch = if stdenv.system == "i686-linux" then "i386"
                else if stdenv.system == "x86_64-linux" then "x86_64"
diff --git a/pkgs/tools/misc/grub/fix-bash-completion.patch b/pkgs/tools/misc/grub/fix-bash-completion.patch
new file mode 100644
index 000000000000..97cecdce373f
--- /dev/null
+++ b/pkgs/tools/misc/grub/fix-bash-completion.patch
@@ -0,0 +1,24 @@
+diff -ubr grub-2.00-orig/util/bash-completion.d/grub-completion.bash.in grub-2.00/util/bash-completion.d/grub-completion.bash.in
+--- grub-2.00-orig/util/bash-completion.d/grub-completion.bash.in	2012-10-16 19:02:36.342733957 +0200
++++ grub-2.00/util/bash-completion.d/grub-completion.bash.in	2012-10-16 19:04:48.262733941 +0200
+@@ -17,6 +17,12 @@
+ # along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
+ # bash completion for grub
+ 
++have()
++{
++    unset -v have
++    _have $1 && have=yes
++}
++
+ __grub_dir() {
+     local i c=1 boot_dir
+ 
+@@ -479,6 +485,7 @@
+ have ${__grub_script_check_program} && \
+  complete -F _grub_script_check -o filenames ${__grub_script_check_program}
+ 
++unset -f have
+ 
+ # Local variables:
+ # mode: shell-script
-- 
cgit 1.4.1


From 347b5800b201b214349b50de3e1610b96fe29ea0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 16 Oct 2012 19:09:14 +0200
Subject: grub-2.0: strip trailing whitespace

---
 pkgs/tools/misc/grub/2.0x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix
index 5006d8f4f4a5..d37ce9f5aac4 100644
--- a/pkgs/tools/misc/grub/2.0x.nix
+++ b/pkgs/tools/misc/grub/2.0x.nix
@@ -4,14 +4,14 @@
 let
 
   prefix = "grub${if EFIsupport then "-efi" else ""}";
-  
+
   version = "2.00";
-  
+
   unifont_bdf = fetchurl {
     url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz";
     sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx";
   };
-  
+
 in
 
 stdenv.mkDerivation rec {
-- 
cgit 1.4.1


From ae7044a0010fa3fe0f88d937226a7463a0a7750f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Oct 2012 17:11:54 -0400
Subject: nix: Update to 1.2pre2950_ac238d6

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index dfe6e491c37e..72af812efc9f 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.2pre2910_b674665";
+  name = "nix-1.2pre2950_ac238d6";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/3031673/download/4/${name}.tar.bz2";
-    sha256 = "fa9849f69a262547856190fe1a24e6d6bd15344fe2ef0a0e54c35ab172074a22";
+    url = "http://hydra.nixos.org/build/3185460/download/4/${name}.tar.bz2";
+    sha256 = "a8aacdf4d459142843848d35a4d51304aaa1e41ca0a6dfdfc287748aa3ca7231";
   };
 
   buildNativeInputs = [ perl pkgconfig ];
-- 
cgit 1.4.1


From 0e930058aeeb1b70caa870c762724ca87036abec Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 18 Oct 2012 20:49:22 +0400
Subject: Update TigerVNC to SVN checkout that at least builds..

---
 pkgs/servers/x11/xorg/default.nix     | 10 ++++++++
 pkgs/servers/x11/xorg/extra.list      |  3 +--
 pkgs/servers/x11/xorg/overrides.nix   | 23 +++++++++++++++++++
 pkgs/tools/admin/tigervnc/default.nix | 43 +++++++++++++++++++----------------
 pkgs/top-level/all-packages.nix       |  2 ++
 5 files changed, 60 insertions(+), 21 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e92d5e4a6667..8508f87e043f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1936,6 +1936,16 @@ let
     };
     buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ];
   })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv ;};
+
+  xorgserver_1_13_0 = (stdenv.mkDerivation ((if overrides ? xorgserver_1_13_0 then overrides.xorgserver_1_13_0 else x: x) {
+    name = "xorg-server-1.13.0";
+    builder = ./builder.sh;
+    src = fetchurl {
+      url = mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2;
+      sha256 = "12pjis236ss3402cg1iy749cylajjp27m3j2jbwd8yh8075r32sl";
+    };
+    buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ];
+  })) // {inherit renderproto libdrm openssl libX11 libXau libXaw libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libXt libXv pixman glproto ;};
     
   xorgsgmldoctools = (stdenv.mkDerivation ((if overrides ? xorgsgmldoctools then overrides.xorgsgmldoctools else x: x) {
     name = "xorg-sgml-doctools-1.11";
diff --git a/pkgs/servers/x11/xorg/extra.list b/pkgs/servers/x11/xorg/extra.list
index 3af867171ef3..f7f139b19c1c 100644
--- a/pkgs/servers/x11/xorg/extra.list
+++ b/pkgs/servers/x11/xorg/extra.list
@@ -1,8 +1,7 @@
-mirror://xorg/individual/driver/xf86-video-intel-2.14.901.tar.bz2:xf86videointel_2_14_901
-mirror://xorg/individual/driver/xf86-video-intel-2.17.0.tar.bz2:xf86videointel_2_17_0
 mirror://xorg/individual/lib/pixman-0.26.2.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-0.3.9.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-image-0.3.9.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-keysyms-0.3.9.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-renderutil-0.3.8.tar.bz2
 mirror://xorg/individual/xcb/xcb-util-wm-0.3.9.tar.bz2
+mirror://xorg/individual/xserver/xorg-server-1.13.0.tar.bz2:xorgserver_1_13_0
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index de32722ed7c4..fdb68b237f07 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -230,6 +230,29 @@ in
       '';
   };
 
+  xorgserver_1_13_0 = attrs: attrs // {
+    configureFlags = "--enable-xcsecurity"; # enable SECURITY extension
+    patches = [./xorgserver-dri-path.patch ./xorgserver-xkbcomp-path.patch];
+    buildInputs = attrs.buildInputs ++
+      [ args.zlib args.udev args.mesa args.dbus.libs
+        xorg.xf86bigfontproto xorg.glproto xorg.xf86driproto
+        xorg.compositeproto xorg.scrnsaverproto xorg.resourceproto
+        xorg.xineramaproto xorg.xf86dgaproto
+        xorg.dmxproto xorg.libdmx xorg.xf86vidmodeproto
+        xorg.recordproto xorg.libXext xorg.pixman xorg.libXfont
+        xorg.damageproto xorg.xcmiscproto xorg.xtrans xorg.bigreqsproto
+      ];
+    propagatedBuildInputs =
+      [ xorg.libpciaccess xorg.inputproto xorg.xextproto xorg.randrproto
+        xorg.dri2proto xorg.kbproto
+      ];
+    postInstall =
+      ''
+        rm -fr $out/share/X11/xkb/compiled
+        ln -s /var/tmp $out/share/X11/xkb/compiled
+      '';
+  };
+
   libSM = attrs: attrs
     // { propagatedBuildInputs = [ xorg.libICE ]; }
     // args.stdenv.lib.optionalAttrs (args.stdenv.system == "i686-darwin") {
diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix
index de61d1e556bd..f74463b10635 100644
--- a/pkgs/tools/admin/tigervnc/default.nix
+++ b/pkgs/tools/admin/tigervnc/default.nix
@@ -3,21 +3,25 @@
 , fontDirectories, fontutil, libgcrypt, gnutls, pam, flex, bison
 , fixesproto, damageproto, xcmiscproto, bigreqsproto, randrproto, renderproto
 , fontsproto, videoproto, compositeproto, scrnsaverproto, resourceproto
-, libxkbfile, libXfont, libpciaccess
+, libxkbfile, libXfont, libpciaccess, cmake, libjpeg_turbo, libXft, fltk, libXinerama
+, xineramaproto, libXcursor, fetchsvn, libxcrypt
 }:
 
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "tigervnc-1.1.0";
+  # Release version = "1.2.0";
+  revision = 5005;
+  version = "r${toString revision}";
+  name = "tigervnc-${version}";
   
-  src = fetchurl {
-    url = "mirror://sourceforge/tigervnc/${name}.tar.gz";
-    sha256 = "1x30s12fwv9rk0fnwwn631qq0d8rpjjx53bvzlx8c91cba170jsr";
+  src = fetchsvn {
+    # Release url = "mirror://sourceforge/tigervnc/${version}/${name}.tar.gz";
+    url = "https://tigervnc.svn.sourceforge.net/svnroot/tigervnc/trunk";
+    rev = revision;
+    sha256 = "2401e0ede9a2d50a37caeb094e5e832d24878749239578f44ae2acd42de01b43";
   };
 
-  configureFlags = "--enable-nls";
-
   inherit fontDirectories;
 
   patchPhase = ''
@@ -39,7 +43,11 @@ stdenv.mkDerivation rec {
   # this:  ${concatStringsSep " " (map (f: "${f}") xorgserver.patches)}
   xorgPatches = xorgserver.patches;
 
+  dontUseCmakeBuildDir = "yes";
+
   postBuild = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fpermissive -Wno-error=int-to-pointer-cast"
+
     # Build Xvnc
     tar xf ${xorgserver.src}
     cp -R xorg*/* unix/xserver
@@ -48,19 +56,13 @@ stdenv.mkDerivation rec {
     do
       patch -p1 < $a
     done
-    patch -p1 < ../xserver18.patch
+    patch -p1 < ../xserver113.patch
     autoreconf -vfi
-    ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx
+    ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out"
     make TIGERVNC_SRCDIR=`pwd`/../..
     popd
   '';
 
-  # I don't know why I need this; it may have to do with this problem:
-  # http://bugs.gentoo.org/show_bug.cgi?id=142852
-  preInstall = ''
-    sed -i -e s,@MKINSTALLDIRS@,`pwd`/mkinstalldirs, po/Makefile
-  '';
-
   postInstall = ''
     pushd unix/xserver
     make TIGERVNC_SRCDIR=`pwd`/../.. install
@@ -70,17 +72,20 @@ stdenv.mkDerivation rec {
     buildInputs = (map (x : x.hostDrv) (buildInputs ++ [
       fixesproto damageproto xcmiscproto bigreqsproto randrproto renderproto
       fontsproto videoproto compositeproto scrnsaverproto resourceproto
-      libxkbfile libXfont libpciaccess
+      libxkbfile libXfont libpciaccess xineramaproto
     ]));
   };
 
   buildInputs =
-    [ libX11 libXext gettext libICE libXtst libXi libSM
-      nasm libgcrypt gnutls pam pixman
+    [ libX11 libXext gettext libICE libXtst libXi libSM libXft
+      nasm libgcrypt gnutls pam pixman libjpeg_turbo fltk xineramaproto
+      libXinerama libXcursor libxcrypt
     ];
   
   buildNativeInputs = 
-    [ autoconf automake cvs utilmacros fontutil libtool flex bison ] 
+    [ autoconf automake cvs utilmacros fontutil libtool flex bison 
+      cmake
+    ] 
       ++ xorgserver.buildNativeInputs;
 
   propagatedBuildNativeInputs = xorgserver.propagatedBuildNativeInputs;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e937c2dbafb1..80f796b892de 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1616,6 +1616,8 @@ let
   tigervnc = callPackage ../tools/admin/tigervnc {
     fontDirectories = [ xorg.fontadobe75dpi xorg.fontmiscmisc xorg.fontcursormisc
       xorg.fontbhlucidatypewriter75dpi ];
+    xorgserver = xorg.xorgserver_1_13_0;
+    fltk = fltk13;
   };
 
   tightvnc = callPackage ../tools/admin/tightvnc {
-- 
cgit 1.4.1


From f5c346d556f8069b683233f96e198efc78291e05 Mon Sep 17 00:00:00 2001
From: Russell O'Connor <roconnor@theorem.ca>
Date: Sun, 21 Oct 2012 03:03:13 +0200
Subject: Add tarsnap package.

---
 pkgs/tools/backup/tarsnap/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/tools/backup/tarsnap/default.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/backup/tarsnap/default.nix b/pkgs/tools/backup/tarsnap/default.nix
new file mode 100644
index 000000000000..bcf03356c683
--- /dev/null
+++ b/pkgs/tools/backup/tarsnap/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, openssl, zlib, e2fsprogs }:
+
+stdenv.mkDerivation {
+  name = "tarsnap-1.0.33";
+
+  src = fetchurl {
+    url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.33.tgz";
+    sha256 = "0z8bmra3xms9vcgvkiy9fy1j97192z6w7n658j6zr5cniid8438c";
+  };
+
+  buildInputs = [ openssl zlib e2fsprogs ];
+
+  meta = {
+    description = "Online backups for the truly paranoid";
+    homepage = "http://www.tarsnap.com/";
+    maintainers = with stdenv.lib.maintainers; [roconnor];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7edc90f59406..4a9a201cbb9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1517,6 +1517,8 @@ let
     autoconf = autoconf213;
   };
 
+  tarsnap = callPackage ../tools/backup/tarsnap { };
+
   tcpdump = callPackage ../tools/networking/tcpdump { };
 
   /*
-- 
cgit 1.4.1


From f2b9fcdc665d15a518c582e8054a006d37ca886e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Oct 2012 19:48:32 +0200
Subject: asciidoc: update to version 8.6.8

---
 pkgs/tools/typesetting/asciidoc/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index a4b9d375bced..f392ad065cc8 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, python }:
 
 stdenv.mkDerivation rec {
-  name = "asciidoc-8.6.6";
+  name = "asciidoc-8.6.8";
   src = fetchurl {
     url = "mirror://sourceforge/asciidoc/${name}.tar.gz";
-    sha256 = "9d54c11716e4309ff4d942cf6a6d9745d6a28754ff1de01efed0dc659457ac71";
+    sha256 = "ffb67f59dccaf6f15db72fcd04fdf21a2f9b703d31f94fcd0c49a424a9fcfbc4";
   };
 
   patchPhase = ''
@@ -20,11 +20,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ python ];
 
   meta = {
+    homepage = "http://www.methods.co.nz/asciidoc/";
+    description = "ASCII text-based document generation system";
+    license = "GPLv2+";
+
     longDescription = ''
       AsciiDoc is a text-based document generation system.  AsciiDoc
       input files can be translated to HTML and DocBook markups.
     '';
-    homepage = http://www.methods.co.nz/asciidoc/;
-    license = "GPLv2+";
   };
 }
-- 
cgit 1.4.1


From ca5077f03f1bae64db08cbe593e57df0f627421c Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 25 Oct 2012 06:07:39 +0200
Subject: 2.6-2 moved to 2.6-3, so patches were not found

Maybe some new important patches can be found here?
http://patch-tracker.debian.org/package/plotutils/2.6-3

upstream source didn't change
---
 pkgs/tools/graphics/plotutils/debian-patches.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/plotutils/debian-patches.nix b/pkgs/tools/graphics/plotutils/debian-patches.nix
index d72974445e6d..0615d1f52e1a 100644
--- a/pkgs/tools/graphics/plotutils/debian-patches.nix
+++ b/pkgs/tools/graphics/plotutils/debian-patches.nix
@@ -1,6 +1,6 @@
 # Generated by debian-patches.sh from debian-patches.txt
 let
-  prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-2";
+  prefix = "http://patch-tracker.debian.org/patch/series/dl/plotutils/2.6-3";
 in
 [
   {
-- 
cgit 1.4.1


From c0b393866f664e9caf8fcf5cdbebb5dd61cdb859 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 26 Oct 2012 10:32:04 +0200
Subject: curl: update to version 7.28.0

---
 pkgs/tools/networking/curl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index ad08065e2eb6..028b672380cf 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -10,11 +10,11 @@ assert sslSupport -> openssl != null;
 assert scpSupport -> libssh2 != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.27.0";
+  name = "curl-7.28.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "164k2vw8v4ppsgqgk4gwhl26h70c8x3rgnl4c2s711626lhmi9db";
+    sha256 = "b7f510db60f520ba0bc8a39cccee7e913362205b4a7709e16af2cba14093099b";
   };
 
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
+    homepage = "http://curl.haxx.se/";
     description = "A command line tool for transferring files with URL syntax";
-    homepage = http://curl.haxx.se/;
   };
 }
-- 
cgit 1.4.1


From 1c1f3962d3bef4c6960698b101361b49202f40dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 26 Oct 2012 10:42:36 +0200
Subject: cabal-install: update to version 1.16.0.1

---
 .../package-management/cabal-install/1.16.0.1.nix  | 23 ++++++++++++++++++++++
 .../package-management/cabal-install/1.16.0.nix    | 23 ----------------------
 pkgs/top-level/haskell-packages.nix                |  6 +++---
 3 files changed, 26 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/tools/package-management/cabal-install/1.16.0.1.nix
 delete mode 100644 pkgs/tools/package-management/cabal-install/1.16.0.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.1.nix b/pkgs/tools/package-management/cabal-install/1.16.0.1.nix
new file mode 100644
index 000000000000..9194fb4385b8
--- /dev/null
+++ b/pkgs/tools/package-management/cabal-install/1.16.0.1.nix
@@ -0,0 +1,23 @@
+{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-install";
+  version = "1.16.0.1";
+  sha256 = "0w9fs3r82ipw0ya95az2y8fqg0c9lkfx6z7q89lp4qhwy2l3g0d3";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    Cabal filepath HTTP mtl network random time zlib
+  ];
+  postInstall = ''
+    mkdir $out/etc
+    mv bash-completion $out/etc/bash_completion.d
+  '';
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "The command-line interface for Cabal and Hackage";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.nix b/pkgs/tools/package-management/cabal-install/1.16.0.nix
deleted file mode 100644
index 7c977989471e..000000000000
--- a/pkgs/tools/package-management/cabal-install/1.16.0.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "1.16.0";
-  sha256 = "0yg8h028sixvzx42v1spjyx4qfhpsar38cvz9188m62rac8ak8az";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network random time zlib
-  ];
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 665ab3f8032a..c9c72cc4a6b5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -146,7 +146,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     vector       = self.vector_0_10_0_1;        # 7.6 ok
     xhtml        = self.xhtml_3000_2_1;         # 7.6 ok
     zlib         = self.zlib_0_5_4_0;           # 7.6 ok
-    cabalInstall = self.cabalInstall_1_16_0;    # 7.6 ok
+    cabalInstall = self.cabalInstall_1_16_0_1;  # 7.6 ok
     alex         = self.alex_3_0_2;             # 7.6 ok
     haddock      = self.haddock_2_13_1;         # 7.6 ok
     happy        = self.happy_1_18_10;          # 7.6 ok
@@ -1911,8 +1911,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cabalInstall_0_8_2  = callPackage ../tools/package-management/cabal-install/0.8.2.nix  {};
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
-  cabalInstall_1_16_0 = callPackage ../tools/package-management/cabal-install/1.16.0.nix {};
-  cabalInstall = self.cabalInstall_1_16_0;
+  cabalInstall_1_16_0_1 = callPackage ../tools/package-management/cabal-install/1.16.0.1.nix {};
+  cabalInstall = self.cabalInstall_1_16_0_1;
 
   jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {};
 
-- 
cgit 1.4.1


From 0efbc7d3bfe6d9eb0fcdecc6964c10c093352e0e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 26 Oct 2012 15:54:53 +0200
Subject: dnsmasq: Update to 2.63

---
 pkgs/tools/networking/dnsmasq/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 89c15b91a1af..20964213d539 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -1,18 +1,20 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.59";
+  name = "dnsmasq-2.63";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.gz";
-    sha256 = "02s1y5320aiqhcrgzc7c2zs292vidijc156k5w7apzzsk5hfdhdx";
+    sha256 = "043p8qjd1zx8bklcli9qnk3vzfz7j2kvl82abvipcg56qsyf71px";
   };
 
   makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale";
 
-  meta = { 
+  meta = {
     description = "An integrated DNS, DHCP and TFTP server for small networks";
     homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html;
     license = "GPL";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
-- 
cgit 1.4.1


From 472c5a5d77404831ea604f3bf76c1da64be1be01 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 29 Oct 2012 23:56:26 +0400
Subject: Update Bluez/Obex

---
 pkgs/os-specific/linux/bluez/default.nix | 4 ++--
 pkgs/tools/bluetooth/obexd/default.nix   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/os-specific/linux/bluez/default.nix b/pkgs/os-specific/linux/bluez/default.nix
index 101879861117..3b876322f1f6 100644
--- a/pkgs/os-specific/linux/bluez/default.nix
+++ b/pkgs/os-specific/linux/bluez/default.nix
@@ -9,11 +9,11 @@ let
 in
    
 stdenv.mkDerivation rec {
-  name = "bluez-4.98";
+  name = "bluez-4.101";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
-    sha256 = "9a5b655bada7c7a1921cb3bac83b8a32bbe49893e4c7a1377cdc1b0d35f7d233";
+    sha256 = "11vldy255zkmmpj0g0a1m6dy9bzsmyd7vxy02cdfdw79ml888wsr";
   };
 
   buildInputs =
diff --git a/pkgs/tools/bluetooth/obexd/default.nix b/pkgs/tools/bluetooth/obexd/default.nix
index 215ecb167bad..1cf3918c21fc 100644
--- a/pkgs/tools/bluetooth/obexd/default.nix
+++ b/pkgs/tools/bluetooth/obexd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, glib, dbus, openobex, bluez, libical }:
    
 stdenv.mkDerivation rec {
-  name = "obexd-0.40";
+  name = "obexd-0.47";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.gz";
-    sha256 = "0jz0ldg2wvdzzl639xzf76hqwj23svlg3zv1r8nc3hik3pgs6h2l";
+    sha256 = "15zw008098qr5az9y1c010yv8gkw1f6hi3mnfcvpmwxwh23kfh4i";
   };
 
   buildInputs = [ glib dbus.libs openobex bluez libical ];
-- 
cgit 1.4.1


From 993601a7c5b8751da033f119a75f0607cecd8004 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 5 Nov 2012 09:45:03 +0100
Subject: screen: Enable PAM support by default.

I hope noone is unhappy with enabling PAM bu default. Whover doesn't want PAM to
take care of authentication can still use the "password" configuration
directive.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/misc/screen/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 329754ab5f5f..930cd67bb135 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, ncurses}:
+{ stdenv, fetchurl, ncurses, pam }:
 
 stdenv.mkDerivation rec {
   name = "screen-4.0.3";
@@ -9,11 +9,11 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    configureFlags="--enable-telnet --infodir=$out/share/info --mandir=$out/share/man"
+    configureFlags="--enable-telnet --enable-pam --infodir=$out/share/info --mandir=$out/share/man"
     sed -i -e "s|/usr/local|/non-existent|g" -e "s|/usr|/non-existent|g" configure Makefile.in */Makefile.in
   '';
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses pam ];
 
   doCheck = true;
 
-- 
cgit 1.4.1


From 11094a79607d37c08378f3b441b276a2ba93bf95 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 5 Nov 2012 22:31:30 +0100
Subject: pinentry: update to version 0.8.2

---
 pkgs/tools/security/pinentry/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 524a582fcb02..ba4ce8a3e220 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -6,11 +6,11 @@
 assert useGtk || useNcurses || useQt4;
 
 stdenv.mkDerivation rec {
-  name = "pinentry-0.8.0";
+  name = "pinentry-0.8.2";
 
   src = fetchurl {
-    url = "mirror://gnupg/pinentry/${name}.tar.gz";
-    sha256 = "06phs3gbs6gf0z9g28z3jgsw312dhhpdgzrx4hhps53xrbwpyv22";
+    url = "mirror://gnupg/pinentry/${name}.tar.bz2";
+    sha256 = "1c9r99ck8072y7nkirddg3p372xadl95y65hyc1m6wn5mavbg12h";
   };
 
   buildInputs = let opt = stdenv.lib.optional; in []
@@ -27,14 +27,13 @@ stdenv.mkDerivation rec {
   buildNativeInputs = [ pkgconfig ];
 
   meta = {
+    homepage = "http://gnupg.org/aegypten2/";
     description = "GnuPG's interface to passphrase input";
+    license = "GPLv2+";
 
     longDescription = ''
       Pinentry provides a console and a GTK+ GUI that allows users to
       enter a passphrase when `gpg' or `gpg2' is run and needs it.
     '';
-
-    homepage = http://gnupg.org/aegypten2/;
-    license = "GPLv2+";
   };
 }
-- 
cgit 1.4.1


From 2658eccaea9163e8a1ad5f1977db549bc388605d Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 6 Nov 2012 11:23:34 +0100
Subject: zip: Add extra source URL

---
 pkgs/tools/archivers/zip/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index c7bddfd6de2c..2e3f111aba46 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -6,7 +6,10 @@ stdenv.mkDerivation {
   name = "zip-3.0";
 
   src = fetchurl {
-    url = ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz;
+    urls = [
+      ftp://ftp.info-zip.org/pub/infozip/src/zip30.tgz
+      http://pkgs.fedoraproject.org/repo/pkgs/zip/zip30.tar.gz/7b74551e63f8ee6aab6fbc86676c0d37/zip30.tar.gz
+    ];
     sha256 = "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h";
   };
 
-- 
cgit 1.4.1


From 43c9c791e03aaa4a481e17ec1c214b1f3c5b4114 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Tue, 6 Nov 2012 11:23:48 +0100
Subject: file: Add extra source URL

---
 pkgs/tools/misc/file/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index 01a674fe2274..38fb0b78cb13 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation {
   name = "file-5.04";
 
   src = fetchurl {
-    url = ftp://ftp.astron.com/pub/file/file-5.04.tar.gz;
+    urls = [
+      ftp://ftp.astron.com/pub/file/file-5.04.tar.gz
+      http://pkgs.fedoraproject.org/repo/pkgs/file/file-5.04.tar.gz/accade81ff1cc774904b47c72c8aeea0/file-5.04.tar.gz
+    ];
     sha256 = "0316lj3jxmp2g8azv0iykmmwjsnjanq93bklccwb6k77jiwnx7jc";
   };
 
-- 
cgit 1.4.1


From 67f478d1ed11191b82ca2a0447230b804976f33a Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 8 Nov 2012 13:54:53 +0100
Subject: ddclient: Upgrade to 3.8.1

---
 .../networking/ddclient/ddclient-foreground.patch  | 92 +++-------------------
 pkgs/tools/networking/ddclient/default.nix         | 15 ++--
 2 files changed, 22 insertions(+), 85 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/ddclient/ddclient-foreground.patch b/pkgs/tools/networking/ddclient/ddclient-foreground.patch
index 954b3e1132fa..1ae3621f5079 100644
--- a/pkgs/tools/networking/ddclient/ddclient-foreground.patch
+++ b/pkgs/tools/networking/ddclient/ddclient-foreground.patch
@@ -1,80 +1,12 @@
-diff -rc ddclient-3.8.0/ddclient ddclient-3.8.0-new/ddclient
-*** ddclient-3.8.0/ddclient	2009-01-27 20:14:02.000000000 +0100
---- ddclient-3.8.0-new/ddclient	2009-09-16 12:56:43.720654327 +0200
-***************
-*** 307,313 ****
-  my %variables = (
-      'global-defaults'    => {
-  	'daemon'              => setv(T_DELAY, 0, 0, 1, 0,                    interval('60s')),
-! 	'file'                => setv(T_FILE,  0, 0, 1, "$etc$program.conf",  undef),
-  	'cache'               => setv(T_FILE,  0, 0, 1, "$cachedir$program.cache", undef),
-  	'pid'                 => setv(T_FILE,  0, 0, 1, "",                   undef),
-  	'proxy'               => setv(T_FQDNP, 0, 0, 1, '',                   undef),
---- 307,314 ----
-  my %variables = (
-      'global-defaults'    => {
-  	'daemon'              => setv(T_DELAY, 0, 0, 1, 0,                    interval('60s')),
-!         'foreground'          => setv(T_BOOL,  0, 0, 1, 0,                    undef),	
-!         'file'                => setv(T_FILE,  0, 0, 1, "$etc$program.conf",  undef),
-  	'cache'               => setv(T_FILE,  0, 0, 1, "$cachedir$program.cache", undef),
-  	'pid'                 => setv(T_FILE,  0, 0, 1, "",                   undef),
-  	'proxy'               => setv(T_FQDNP, 0, 0, 1, '',                   undef),
-***************
-*** 535,540 ****
---- 536,542 ----
-      "usage: ${program} [options]",
-      "options are:",
-      [ "daemon",      "=s", "-daemon delay         : run as a daemon, specify delay as an interval." ],
-+     [ "foreground",  "!",  "-foreground           : do not fork" ],
-      [ "proxy",       "=s", "-proxy host           : use 'host' as the HTTP proxy" ],
-      [ "server",      "=s", "-server host          : update DNS information on 'host'" ],
-      [ "protocol",    "=s", "-protocol type        : update protocol used" ],
-***************
-*** 623,629 ****
-  $SIG{'HUP'}    = sub { $caught_hup  = 1; };
-  $SIG{'TERM'}   = sub { $caught_term = 1; };
-  $SIG{'KILL'}   = sub { $caught_kill = 1; };
-! if (opt('daemon') && !opt('force')) {
-      $SIG{'CHLD'}   = 'IGNORE';
-      my $pid = fork;
-      if ($pid < 0) {
---- 625,634 ----
-  $SIG{'HUP'}    = sub { $caught_hup  = 1; };
-  $SIG{'TERM'}   = sub { $caught_term = 1; };
-  $SIG{'KILL'}   = sub { $caught_kill = 1; };
-! # don't fork() if foreground or force is on
-! if (opt('foreground') || opt('force')) {
-!     ;
-! } elsif (opt('daemon')) {
-      $SIG{'CHLD'}   = 'IGNORE';
-      my $pid = fork;
-      if ($pid < 0) {
-***************
-*** 633,644 ****
-  	exit 0;
-      }
-      $SIG{'CHLD'}   = 'DEFAULT';
--     $opt{'syslog'} = 1;
-      open(STDOUT, ">/dev/null");
-      open(STDERR, ">/dev/null");
-      open(STDIN,  "</dev/null");
-! 
-!     write_pid();
-  }
-  
-  umask 077;
---- 638,650 ----
-  	exit 0;
-      }
-      $SIG{'CHLD'}   = 'DEFAULT';
-      open(STDOUT, ">/dev/null");
-      open(STDERR, ">/dev/null");
-      open(STDIN,  "</dev/null");
-! }
-! if(opt('daemon')) {
-!      write_pid();
-!     $opt{'syslog'} = 1;
-  }
-  
-  umask 077;
-Only in ddclient-3.8.0-new: ddclient~
+diff -u ddclient-3.8.1/ddclient ddclient-3.8.1.patched/ddclient
+--- ddclient-3.8.1/ddclient	2011-07-11 23:04:21.000000000 +0200
++++ ddclient-3.8.1.patched/ddclient	2012-11-08 11:52:31.930647236 +0100
+@@ -574,7 +574,7 @@
+     "usage: ${program} [options]",
+     "options are:",
+     [ "daemon",      "=s", "-daemon delay         : run as a daemon, specify delay as an interval." ],
+-+     [ "foreground",  "!",  "-foreground           : do not fork" ],
++    [ "foreground",  "!",  "-foreground           : do not fork" ],
+     [ "proxy",       "=s", "-proxy host           : use 'host' as the HTTP proxy" ],
+     [ "server",      "=s", "-server host          : update DNS information on 'host'" ],
+     [ "protocol",    "=s", "-protocol type        : update protocol used" ],
diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix
index e57ba489450f..22539657b1f1 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -1,17 +1,23 @@
-{buildPerlPackage, fetchurl, perl}:
+{buildPerlPackage, fetchurl, perlPackages, iproute}:
 
 buildPerlPackage {
-  name = "ddclient-3.8.0";
+  name = "ddclient-3.8.1";
 
   src = fetchurl {
-    url = mirror://sourceforge/ddclient/ddclient-3.8.0.tar.gz ;
-    sha256 = "1cqz6fwx8bcl7zdrvm6irh3bzs8858gkyficww9simyjmz7z3w48";
+    url = mirror://sourceforge/ddclient/ddclient-3.8.1.tar.gz ;
+    sha256 = "f22ac7b0ec78e310d7b88a1cf636e5c00360b2ed9c087f231b3522ef3e6295f2";
   };
 
+  buildInputs = [ perlPackages.IOSocketSSL ];
+
   patches = [ ./ddclient-foreground.patch ];
 
+  # Use iproute2 instead of ifconfig
   preConfigure = '' 
     touch Makefile.PL
+    substituteInPlace ddclient --replace 'in the output of ifconfig' 'in the output of ip addr show'
+    substituteInPlace ddclient --replace 'ifconfig -a' '${iproute}/sbin/ip addr show'
+    substituteInPlace ddclient --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg'
   ''; 
 
   installPhase = ''
@@ -20,5 +26,4 @@ buildPerlPackage {
   '';
 
   doCheck = false;
-
 }
-- 
cgit 1.4.1


From 8165e2ddb05185a5dcc8582d7973b69626da156a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Nov 2012 15:18:09 +0100
Subject: Document that Java packages should install JARs in $out/lib/java

---
 doc/language-support.xml                | 11 ++++++-----
 pkgs/tools/misc/jdiskreport/builder.sh  |  9 +++++----
 pkgs/tools/misc/jdiskreport/default.nix | 14 +++++++-------
 3 files changed, 18 insertions(+), 16 deletions(-)

(limited to 'pkgs/tools')

diff --git a/doc/language-support.xml b/doc/language-support.xml
index 47729a1b4ba9..6cc028c0b0a2 100644
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@@ -196,17 +196,18 @@ twisted = buildPythonPackage {
 </section>
 
 
-<!--
-<section><title>Haskell</title>
+<section><title>Java</title>
 
-<para>TODO</para>
+<para>Java packages should install JAR files in
+<filename>$out/lib/java</filename>.</para>
 
 </section>
 
 
-<section><title>Java</title>
+<!--
+<section><title>Haskell</title>
 
-<para>TODO; Java support needs lots of improvement</para>
+<para>TODO</para>
 
 </section>
 
diff --git a/pkgs/tools/misc/jdiskreport/builder.sh b/pkgs/tools/misc/jdiskreport/builder.sh
index 1e73b674c157..cdc5f94bde0c 100644
--- a/pkgs/tools/misc/jdiskreport/builder.sh
+++ b/pkgs/tools/misc/jdiskreport/builder.sh
@@ -2,13 +2,14 @@ source $stdenv/setup
 
 unzip $src
 
-mkdir -p $out/jars
-mv */*.jar $out/jars
-jar=$(ls $out/jars/jdiskreport-*.jar)
+jar=$(ls */*.jar)
+
+mkdir -p $out/lib/java
+mv $jar $out/lib/java
 
 mkdir -p $out/bin
 cat > $out/bin/jdiskreport <<EOF
 #! $SHELL -e
-exec $jdk/bin/java -jar $jar
+exec $jre/bin/java -jar $out/lib/java/$(basename $jar)
 EOF
 chmod +x $out/bin/jdiskreport
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index 7a4de418a8c3..2457668d5b02 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -1,22 +1,22 @@
-{ stdenv, fetchurl, unzip, jdk }:
+{ stdenv, fetchurl, unzip, jre }:
 
 stdenv.mkDerivation rec {
   name = "jdiskreport-1.4.0";
-  
+
   builder = ./builder.sh;
-  
+
   src = fetchurl {
     url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_4_0.zip;
     sha256 = "0kx43480p89wlyza94lzqygqfafsdf964syc2c24q28y42psz4kd";
   };
-  
+
   buildInputs = [ unzip ];
-  
-  inherit jdk;
+
+  inherit jre;
 
   meta = {
     homepage = http://www.jgoodies.com/freeware/jdiskreport/;
     description = "A graphical utility to visualize disk usage";
     license = "unfree-redistributable";
-  };  
+  };
 }
-- 
cgit 1.4.1


From b74e1c9187fdaa88c0938c70ec0c5d7e27a5bbc5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Nov 2012 15:42:14 +0100
Subject: ec2-api-tools: Update to 1.6.5.1

Also, move everything to $out/libexec/ec2-api-tools.
---
 .../tools/virtualization/ec2-api-tools/default.nix | 23 ++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/virtualization/ec2-api-tools/default.nix b/pkgs/tools/virtualization/ec2-api-tools/default.nix
index 22669c67b121..ac2902aab94d 100644
--- a/pkgs/tools/virtualization/ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix
@@ -1,28 +1,31 @@
 { stdenv, fetchurl, unzip, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  name = "ec2-api-tools-1.6.0.0";
-  
+  name = "ec2-api-tools-1.6.5.1";
+
   src = fetchurl {
     url = "http://nixos.org/tarballs/${name}.zip";
-    sha256 = "1j9isvi6g68zhk7zxs29yad2d0rpnbqx8fz25yn5paqx9c8pzqcl";
+    sha256 = "1j2pc20vggi4hv950999mhh7dl6475yma76nyj6k0hzkd1lf5hda";
   };
 
   buildInputs = [ unzip makeWrapper ];
 
   installPhase =
     ''
-      mkdir -p $out
-      mv * $out
-      rm $out/bin/*.cmd # Windows stuff
+      d=$out/libexec/ec2-api-tools
+      mkdir -p $d
+      mv * $d
+      rm $d/bin/*.cmd # Windows stuff
 
-      for i in $out/bin/*; do
-          wrapProgram $i \
-            --set EC2_HOME $out \
+      for i in $d/bin/*; do
+          b=$(basename $i)
+          if [ $b = "ec2-cmd" ]; then continue; fi
+          makeWrapper $i $out/bin/$(basename $i) \
+            --set EC2_HOME $d \
             --set JAVA_HOME ${jre}
       done
     ''; # */
-  
+
   meta = {
     homepage = http://developer.amazonwebservices.com/connect/entry.jspa?externalID=351;
     description = "Command-line tools to create and manage Amazon EC2 virtual machines";
-- 
cgit 1.4.1


From a668efbae2a9e7a16f490206eaa12ee106f2e61e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 8 Nov 2012 16:13:23 +0100
Subject: dpkg: Update to 1.16.9 and fix the Perl-based tools

---
 pkgs/tools/package-management/dpkg/default.nix | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 95682df5d39c..849780ad047d 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,21 +1,18 @@
-{stdenv, fetchurl, perl, zlib, bzip2, xz}:
+{ stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
 
-let version = "1.16.8"; in
+let version = "1.16.9"; in
 
 stdenv.mkDerivation {
   name = "dpkg-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "4a1f4611390d93f1f198d910d3a4e4913b3cf81702b31f585a1872ca98df0eaa";
+    sha256 = "0ykby9x4x2zb7rfj30lfjcsrq2q32z2lnsrl8pbdvb2l9sx7zkbk";
   };
 
-  configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg ";
+  configureFlags = "--disable-dselect --with-admindir=/var/lib/dpkg PERL_LIBDIR=$(out)/${perl.libPrefix}";
 
   preConfigure = ''
-    # Can't use substitute pending resolution of NIXPKGS-89.
-    sed -s 's^/usr/bin/perl^${perl}/bin/perl^' -i scripts/dpkg-architecture.pl
-
     # Nice: dpkg has a circular dependency on itself.  Its configure
     # script calls scripts/dpkg-architecture, which calls "dpkg" in
     # $PATH.  It doesn't actually use its result, but fails if it
@@ -24,15 +21,25 @@ stdenv.mkDerivation {
     chmod +x $TMPDIR/dpkg
     PATH=$TMPDIR:$PATH
 
-    for i in $(find . -name Makefile.in); do 
+    for i in $(find . -name Makefile.in); do
       substituteInPlace $i --replace "install-data-local:" "disabled:" ;
     done
   '';
 
-  buildInputs = [ perl zlib bzip2 xz ];
+  buildInputs = [ perl zlib bzip2 xz makeWrapper ];
+
+  postInstall =
+    ''
+      for i in $out/bin/*; do
+        if head -n 1 $i | grep -q perl; then
+          wrapProgram $i --prefix PERL5LIB : $out/${perl.libPrefix}
+        fi
+      done # */
+    '';
 
   meta = {
     description = "The Debian package manager";
     homepage = http://wiki.debian.org/Teams/Dpkg;
+    platforms = stdenv.lib.platforms.linux;
   };
 }
-- 
cgit 1.4.1


From 16dbe75e57cc52aa8dab4724efb837db7244ed0b Mon Sep 17 00:00:00 2001
From: Lluís Batlle i Rossell <viric@viric.name>
Date: Sat, 27 Oct 2012 14:46:36 +0200
Subject: sharutils: making them crossbuild, thanks to a patch.

Patch taken from:
http://repository.timesys.com/buildsources/s/sharutils/sharutils-4.11.1/sharutils-4.11.1-cross-binary-mode-popen.patch
after a google search for the guilty part of 'configure'.
---
 pkgs/tools/archivers/sharutils/default.nix         |  4 ++
 .../sharutils-4.11.1-cross-binary-mode-popen.patch | 63 ++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix
index 15b8ead7d38b..2773e112a49b 100644
--- a/pkgs/tools/archivers/sharutils/default.nix
+++ b/pkgs/tools/archivers/sharutils/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  crossAttrs = {
+    patches = [ ./sharutils-4.11.1-cross-binary-mode-popen.patch ];
+  };
+
   meta = {
     description = "GNU Sharutils, tools for remote synchronization and `shell archives'";
 
diff --git a/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch b/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch
new file mode 100644
index 000000000000..f05eab251d4c
--- /dev/null
+++ b/pkgs/tools/archivers/sharutils/sharutils-4.11.1-cross-binary-mode-popen.patch
@@ -0,0 +1,63 @@
+diff -Naur sharutils-4.11.1.orig/configure sharutils-4.11.1/configure
+--- sharutils-4.11.1.orig/configure	2011-06-20 11:07:40.000000000 -0400
++++ sharutils-4.11.1/configure	2011-06-20 11:09:30.000000000 -0400
+@@ -26962,33 +26962,33 @@
+   CATALOGS="$new_CATALOGS"
+ fi
+ 
+-if test "$cross_compiling" = yes; then :
+-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
+-
+-int
+-main ()
+-{
+-    FILE * fp = popen ("date", "rb");
+-    exit (fp == NULL);
+-  ;
+-  return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+-
++#if test "$cross_compiling" = yes; then :
++#  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++#$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++#as_fn_error $? "cannot run test program while cross compiling
++#See \`config.log' for more details" "$LINENO" 5; }
++#else
++#  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++#/* end confdefs.h.  */
++#
++#int
++#main ()
++#{
++#    FILE * fp = popen ("date", "rb");
++#    exit (fp == NULL);
++#  ;
++#  return 0;
++#}
++#_ACEOF
++#if ac_fn_c_try_run "$LINENO"; then :
++#
+ $as_echo "#define BINARY_MODE_POPEN 1" >>confdefs.h
+-
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+-  conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
++#
++#
++#fi
++#rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
++#  conftest.$ac_objext conftest.beam conftest.$ac_ext
++#fi
+ 
+ 
+ 
-- 
cgit 1.4.1


From 0b29bb8fd2220df903dcdf5d717f444bfad3601b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 9 Nov 2012 11:34:11 +0100
Subject: cabal-install: update to version 1.16.0.2

---
 .../package-management/cabal-install/1.16.0.1.nix  | 23 ----------------------
 .../package-management/cabal-install/1.16.0.2.nix  | 23 ++++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix                |  6 +++---
 3 files changed, 26 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/tools/package-management/cabal-install/1.16.0.1.nix
 create mode 100644 pkgs/tools/package-management/cabal-install/1.16.0.2.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.1.nix b/pkgs/tools/package-management/cabal-install/1.16.0.1.nix
deleted file mode 100644
index 9194fb4385b8..000000000000
--- a/pkgs/tools/package-management/cabal-install/1.16.0.1.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
-
-cabal.mkDerivation (self: {
-  pname = "cabal-install";
-  version = "1.16.0.1";
-  sha256 = "0w9fs3r82ipw0ya95az2y8fqg0c9lkfx6z7q89lp4qhwy2l3g0d3";
-  isLibrary = false;
-  isExecutable = true;
-  buildDepends = [
-    Cabal filepath HTTP mtl network random time zlib
-  ];
-  postInstall = ''
-    mkdir $out/etc
-    mv bash-completion $out/etc/bash_completion.d
-  '';
-  meta = {
-    homepage = "http://www.haskell.org/cabal/";
-    description = "The command-line interface for Cabal and Hackage";
-    license = self.stdenv.lib.licenses.bsd3;
-    platforms = self.ghc.meta.platforms;
-    maintainers = [ self.stdenv.lib.maintainers.andres ];
-  };
-})
diff --git a/pkgs/tools/package-management/cabal-install/1.16.0.2.nix b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix
new file mode 100644
index 000000000000..8f28f57c18f3
--- /dev/null
+++ b/pkgs/tools/package-management/cabal-install/1.16.0.2.nix
@@ -0,0 +1,23 @@
+{ cabal, Cabal, filepath, HTTP, mtl, network, random, time, zlib }:
+
+cabal.mkDerivation (self: {
+  pname = "cabal-install";
+  version = "1.16.0.2";
+  sha256 = "162nbkkffpbalg368m5s49jrvg9nibdwlwj0j1b8wriyyg4srpv6";
+  isLibrary = false;
+  isExecutable = true;
+  buildDepends = [
+    Cabal filepath HTTP mtl network random time zlib
+  ];
+  postInstall = ''
+    mkdir $out/etc
+    mv bash-completion $out/etc/bash_completion.d
+  '';
+  meta = {
+    homepage = "http://www.haskell.org/cabal/";
+    description = "The command-line interface for Cabal and Hackage";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 90b7385147da..77c514f472d5 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -146,7 +146,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
     vector       = self.vector_0_10_0_1;        # 7.6 ok
     xhtml        = self.xhtml_3000_2_1;         # 7.6 ok
     zlib         = self.zlib_0_5_4_0;           # 7.6 ok
-    cabalInstall = self.cabalInstall_1_16_0_1;  # 7.6 ok
+    cabalInstall = self.cabalInstall_1_16_0_2;  # 7.6 ok
     alex         = self.alex_3_0_2;             # 7.6 ok
     haddock      = self.haddock_2_13_1;         # 7.6 ok
     happy        = self.happy_1_18_10;          # 7.6 ok
@@ -1943,8 +1943,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
   cabalInstall_0_8_2  = callPackage ../tools/package-management/cabal-install/0.8.2.nix  {};
   cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
   cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
-  cabalInstall_1_16_0_1 = callPackage ../tools/package-management/cabal-install/1.16.0.1.nix {};
-  cabalInstall = self.cabalInstall_1_16_0_1;
+  cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};
+  cabalInstall = self.cabalInstall_1_16_0_2;
 
   jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {};
 
-- 
cgit 1.4.1


From 3d4068b11a6f1031109b827dd4a47648536a52dd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 11 Nov 2012 20:16:21 +0100
Subject: graphviz: patch broken cdt.h header file

The cdt.h header duplicates the signatures of standard library functions
memcmp() and strcpy(), but those signatures don't match the real thing when
building with a C++ compiler, because they lack the no-throw declaration glibc
has. Simply dropping those redundant prototypes remedies the issue.
---
 pkgs/tools/graphics/graphviz/default.nix                  |  2 ++
 .../graphics/graphviz/fix-broken-memcp-signature.patch    | 15 +++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/tools/graphics/graphviz/fix-broken-memcp-signature.patch

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 4edec43e243c..db4d766b7605 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
       pango gd gts
     ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ];
 
+  patches = [ ./fix-broken-memcp-signature.patch ];
+
   configureFlags =
     [ "--with-pngincludedir=${libpng}/include"
       "--with-pnglibdir=${libpng}/lib"
diff --git a/pkgs/tools/graphics/graphviz/fix-broken-memcp-signature.patch b/pkgs/tools/graphics/graphviz/fix-broken-memcp-signature.patch
new file mode 100644
index 000000000000..e93728d4850e
--- /dev/null
+++ b/pkgs/tools/graphics/graphviz/fix-broken-memcp-signature.patch
@@ -0,0 +1,15 @@
+diff -ubr graphviz-2.28.0-orig/lib/cdt/cdt.h graphviz-2.28.0-new/lib/cdt/cdt.h
+--- graphviz-2.28.0-orig/lib/cdt/cdt.h	2012-11-11 20:05:55.674397100 +0100
++++ graphviz-2.28.0-new/lib/cdt/cdt.h	2012-11-11 20:06:28.069511092 +0100
+@@ -238,11 +238,6 @@
+ extern int		dtstat _ARG_((Dt_t*, Dtstat_t*, int));
+ extern unsigned int	dtstrhash _ARG_((unsigned int, Void_t*, int));
+ 
+-#if !_PACKAGE_ast
+-extern int		memcmp _ARG_((const Void_t*, const Void_t*, size_t));
+-extern int		strcmp _ARG_((const char*, const char*));
+-#endif
+-
+ #undef extern
+ _END_EXTERNS_
+ 
-- 
cgit 1.4.1


From 66ceb14b5ecb06538105fce66f12bc17828554d5 Mon Sep 17 00:00:00 2001
From: Lluis Batlle <viriketo@gmail.com>
Date: Wed, 14 Nov 2012 23:20:47 +0100
Subject: pth, gpg: taking out pth in non-supported platforms.

I know that pth fails to build on arm, by now.
---
 pkgs/development/libraries/gpgme/default.nix     | 3 ++-
 pkgs/development/libraries/libassuan/default.nix | 3 ++-
 pkgs/development/libraries/pth/default.nix       | 4 ++++
 pkgs/tools/security/gnupg/default.nix            | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 582208f08b67..9dba035d15f2 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm";
   };
   
-  propagatedBuildInputs = [ libgpgerror glib pth libassuan ];
+  propagatedBuildInputs = [ libgpgerror glib libassuan ]
+    ++ stdenv.lib.optional pth.supported pth;
 
   buildNativeInputs = [ pkgconfig ];
 
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index 362ecd403d2e..619ef4d97fb4 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -8,7 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds";
   };
 
-  propagatedBuildInputs = [ pth libgpgerror ];
+  propagatedBuildInputs = [ libgpgerror ]
+    ++ stdenv.lib.optional pth.supported pth;
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index ffd81f84489d..cd20af5bb07b 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
   };
 
+  passthru = {
+    supported = ! stdenv.isArm;
+  };
+
   meta = {
     description = "The GNU Portable Threads library";
     homepage = http://www.gnu.org/software/pth;
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 0667a7f9885c..8b528e15c059 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -20,7 +20,8 @@ stdenv.mkDerivation rec {
     sha256 = "08n636sfffs5qvg9ppiprvsh00q0dmdw425psg3m3nssja53m8pg";
   };
 
-  buildInputs = [ readline zlib libgpgerror pth libgcrypt libassuan libksba ]
+  buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba ]
+    ++ stdenv.lib.optional pth.supported pth
     ++ stdenv.lib.optional useLdap openldap
     ++ stdenv.lib.optional useBzip2 bzip2
     ++ stdenv.lib.optional useUsb libusb
-- 
cgit 1.4.1


From 086e1e84fa860a5935024e83d184035575cd5d8c Mon Sep 17 00:00:00 2001
From: Lluis Batlle <viriketo@gmail.com>
Date: Thu, 15 Nov 2012 08:58:48 +0100
Subject: gnupg1: updating to 1.4.12

---
 pkgs/tools/security/gnupg1/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/security/gnupg1/default.nix b/pkgs/tools/security/gnupg1/default.nix
index 0674fc4e4803..b3bf309b48e1 100644
--- a/pkgs/tools/security/gnupg1/default.nix
+++ b/pkgs/tools/security/gnupg1/default.nix
@@ -15,11 +15,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "gnupg-1.4.11";
+  name = "gnupg-1.4.12";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1xkfxr4z2fy9d5d6hj4lzv854lk227kgv6qb2w0sam752snfx36i";
+    sha1 = "9b78e20328d35525af7b8a9c1cf081396910e937";
   };
 
   buildInputs = [ readline bzip2 ];
-- 
cgit 1.4.1


From d2d761b692e3ab08b2ad864cf1fd0e4b0f93917c Mon Sep 17 00:00:00 2001
From: Lluis Batlle <viriketo@gmail.com>
Date: Thu, 15 Nov 2012 11:18:38 +0100
Subject: gpg/pth: fixing the pth building on arm

I could built pth with the fix commented in:
http://forums.gentoo.org/viewtopic-t-904280-start-0.html

And I remove the 'pth.supported' structure I had built.
---
 pkgs/development/libraries/gpgme/default.nix     | 17 +++++++++++++----
 pkgs/development/libraries/libassuan/default.nix |  3 +--
 pkgs/development/libraries/pth/default.nix       |  6 +++---
 pkgs/tools/security/gnupg/default.nix            |  3 +--
 pkgs/top-level/all-packages.nix                  |  4 +++-
 5 files changed, 21 insertions(+), 12 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 9dba035d15f2..2f1411a0bdaa 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,5 +1,15 @@
-{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
+{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
+, useGnupg1 ? false, gnupg1 ? null }:
 
+assert useGnupg1 -> gnupg1 != null;
+assert !useGnupg1 -> gnupg != null;
+
+let
+  gpgPath = if useGnupg1 then
+    "${gnupg1}/bin/gpg"
+  else
+    "${gnupg}/bin/gpg2";
+in
 stdenv.mkDerivation rec {
   name = "gpgme-1.3.1";
   
@@ -8,10 +18,9 @@ stdenv.mkDerivation rec {
     sha256 = "1m7l7nicn6gd952cgspv9xr8whqivbg33nbg8kbpj3dffnl2gvqm";
   };
   
-  propagatedBuildInputs = [ libgpgerror glib libassuan ]
-    ++ stdenv.lib.optional pth.supported pth;
+  propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
 
   buildNativeInputs = [ pkgconfig ];
 
-  configureFlags = "--with-gpg=${gnupg}/bin/gpg2";
+  configureFlags = "--with-gpg=${gpgPath}";
 }
diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix
index 619ef4d97fb4..f93a44c2e1d1 100644
--- a/pkgs/development/libraries/libassuan/default.nix
+++ b/pkgs/development/libraries/libassuan/default.nix
@@ -8,8 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "06xckkvxxlx7cj77803m8x58gxksap4k8yhspc5cqsy7fhinimds";
   };
 
-  propagatedBuildInputs = [ libgpgerror ]
-    ++ stdenv.lib.optional pth.supported pth;
+  propagatedBuildInputs = [ libgpgerror pth ];
 
   doCheck = true;
 
diff --git a/pkgs/development/libraries/pth/default.nix b/pkgs/development/libraries/pth/default.nix
index cd20af5bb07b..b7b09caed9b3 100644
--- a/pkgs/development/libraries/pth/default.nix
+++ b/pkgs/development/libraries/pth/default.nix
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "0ckjqw5kz5m30srqi87idj7xhpw6bpki43mj07bazjm2qmh3cdbj";
   };
 
-  passthru = {
-    supported = ! stdenv.isArm;
-  };
+  preConfigure = stdenv.lib.optionalString stdenv.isArm ''
+    configureFlagsArray=("CFLAGS=-DJB_SP=8 -DJB_PC=9")
+  '';
 
   meta = {
     description = "The GNU Portable Threads library";
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index 8b528e15c059..ba680cb8ba43 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
     sha256 = "08n636sfffs5qvg9ppiprvsh00q0dmdw425psg3m3nssja53m8pg";
   };
 
-  buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba ]
-    ++ stdenv.lib.optional pth.supported pth
+  buildInputs = [ readline zlib libgpgerror libgcrypt libassuan libksba pth ]
     ++ stdenv.lib.optional useLdap openldap
     ++ stdenv.lib.optional useBzip2 bzip2
     ++ stdenv.lib.optional useUsb libusb
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bc1841805575..abe8cdf67bd9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3839,7 +3839,9 @@ let
   gnutls_without_guile = gnutls.override { guileBindings = false; };
   gnutls2_without_guile = gnutls2.override { guileBindings = false; };
 
-  gpgme = callPackage ../development/libraries/gpgme { };
+  gpgme = callPackage ../development/libraries/gpgme {
+    gnupg1 = gnupg1orig;
+  };
 
   grantlee = callPackage ../development/libraries/grantlee { };
 
-- 
cgit 1.4.1


From aa2c066f395369ccc8ac6173bb84808f28488b86 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 17 Nov 2012 20:05:21 +0100
Subject: ddrescue: upgrade to 1.16

---
 pkgs/tools/system/ddrescue/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/system/ddrescue/default.nix b/pkgs/tools/system/ddrescue/default.nix
index 0ca5d6af2d75..8fa40e5710f1 100644
--- a/pkgs/tools/system/ddrescue/default.nix
+++ b/pkgs/tools/system/ddrescue/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "ddrescue-1.15";
+  name = "ddrescue-1.16";
 
   src = fetchurl {
     url = "mirror://gnu/ddrescue/${name}.tar.gz";
-    sha256 = "0y1dxkbl82nli6xjlg2kaq5kxd19480rvpay4ydbb9av01i17q3m";
+    sha256 = "1rixya7p8c4jrn4p0flf6h5dqwybrilf3hrj4r7x41h3zgjz5cvn";
   };
 
   doCheck = true;
-- 
cgit 1.4.1


From b4e7e21134f5c675018146972ae2a1fc52e96731 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sat, 17 Nov 2012 20:14:55 +0100
Subject: add package: "safecopy-1.7"

---
 pkgs/tools/system/safecopy/default.nix | 30 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/system/safecopy/default.nix

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix
new file mode 100644
index 000000000000..049503b1531b
--- /dev/null
+++ b/pkgs/tools/system/safecopy/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "safecopy-1.7";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/projects/safecopy/safecopy/${name}/${name}.tar.gz";
+    sha256 = "1zf4kk9r8za9pn4hzy1y3j02vrhl1rxfk5adyfq0w0k48xfyvys2";
+  };
+
+  meta = {
+    description = "data recovery tool for damaged hardware";
+
+    longDescription =
+      '' Safecopy is a data recovery tool which tries to extract as much data as possible from a
+         problematic (i.e. damaged sectors) source - like floppy drives, hard disk partitions, CDs,
+         tape devices, etc, where other tools like dd would fail due to I/O errors.
+
+         Safecopy includes a low level IO layer to read CDROM disks in raw mode, and issue device
+         resets and other helpful low level operations on a number of other device classes.
+       '';
+
+    homepage = http://safecopy.sourceforge.net;
+
+    license = "GPLv2+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.bluescreen303 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 87aa10b90fb4..5ee4f2044934 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1448,6 +1448,8 @@ let
 
   sablotron = callPackage ../tools/text/xml/sablotron { };
 
+  safecopy = callPackage ../tools/system/safecopy { };
+
   salut_a_toi = callPackage ../applications/networking/instant-messengers/salut-a-toi {};
 
   screen = callPackage ../tools/misc/screen { };
-- 
cgit 1.4.1


From 2df8e9f401b48181d8c41fd6bc3bcb26bb099b3c Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Sun, 18 Nov 2012 00:01:48 +0100
Subject: typo in url

---
 pkgs/tools/system/safecopy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/system/safecopy/default.nix b/pkgs/tools/system/safecopy/default.nix
index 049503b1531b..a6a5fced8794 100644
--- a/pkgs/tools/system/safecopy/default.nix
+++ b/pkgs/tools/system/safecopy/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "safecopy-1.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/projects/safecopy/safecopy/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/safecopy/safecopy/${name}/${name}.tar.gz";
     sha256 = "1zf4kk9r8za9pn4hzy1y3j02vrhl1rxfk5adyfq0w0k48xfyvys2";
   };
 
-- 
cgit 1.4.1


From 98ad2452009363dc98ed0065d16a646839043285 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Sun, 18 Nov 2012 09:34:57 +0100
Subject: nss-pam-ldapd: Upgrade to 0.8.11

---
 pkgs/tools/networking/nss-pam-ldapd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/networking/nss-pam-ldapd/default.nix b/pkgs/tools/networking/nss-pam-ldapd/default.nix
index 9abfcbbe42a1..92cb053bb44b 100644
--- a/pkgs/tools/networking/nss-pam-ldapd/default.nix
+++ b/pkgs/tools/networking/nss-pam-ldapd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "nss-pam-ldapd-${version}";
-  version = "0.8.10";
+  version = "0.8.11";
   
   src = fetchurl {
     url = "http://arthurdejong.org/nss-pam-ldapd/${name}.tar.gz";
-    sha256 = "673a5e235a40fd9aac74082bc64d2ac2280fc155fb00b21092650d2c963e79cc";
+    sha256 = "9a841f6a46bf9f87213dc806c0f6507ac5016a2ee550d42c3ed9fb280c1e38e6";
   };
   
   buildInputs = [ makeWrapper pkgconfig python openldap pam ];
-- 
cgit 1.4.1


From f0bd33556f8fc22a3953f4385aee45cad2c458bf Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 20 Nov 2012 11:16:32 +0100
Subject: smartmontools: update drivedb file to trunk revision 3605

---
 pkgs/tools/system/smartmontools/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/system/smartmontools/default.nix b/pkgs/tools/system/smartmontools/default.nix
index 2f93f18ade59..89f8d3f5e77f 100644
--- a/pkgs/tools/system/smartmontools/default.nix
+++ b/pkgs/tools/system/smartmontools/default.nix
@@ -2,8 +2,9 @@
 
 let
   driverdb = fetchurl {
-    url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/branches/RELEASE_5_43_DRIVEDB/smartmontools/drivedb.h?revision=3605";
-    sha256 = "1kibx5aal903hcpy6mjmfik6n9j142i3q3vvrcp1wmz10mfsqj8f";
+    url = "http://smartmontools.svn.sourceforge.net/viewvc/smartmontools/trunk/smartmontools/drivedb.h?revision=3685";
+    sha256 = "11zczy03asfpj4wwip5bf3fpingdc7biz1cs3cykg4vnlxiwjxkx";
+    name = "smartmontools-drivedb.h";
   };
 in
 stdenv.mkDerivation rec {
@@ -14,7 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "9fe4ff2b7bcd00fde19db82bba168f5462ed6e857d3ef439495e304e3231d3a6";
   };
 
-  # patchPhase = "cp ${driverdb} drivedb.h";
+  patchPhase = ''
+    cp ${driverdb} drivedb.h
+    sed -i -e 's@which which >/dev/null || exit 1@alias which="type -p"@' update-smart-drivedb.in
+  '';
 
   meta = {
     description = "Tools for monitoring the health of hard drivers";
-- 
cgit 1.4.1


From 144b06f1075bce4bb6584ec3a67ca6337ec34d3d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 20 Nov 2012 12:12:24 +0100
Subject: nix: Update to 1.2pre2980

---
 pkgs/tools/package-management/nix/unstable.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'pkgs/tools')

diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 72af812efc9f..30e52da86389 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.2pre2950_ac238d6";
+  name = "nix-1.2pre2980_9de6bc5";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/3185460/download/4/${name}.tar.bz2";
-    sha256 = "a8aacdf4d459142843848d35a4d51304aaa1e41ca0a6dfdfc287748aa3ca7231";
+    url = "http://hydra.nixos.org/build/3338447/download/4/${name}.tar.bz2";
+    sha256 = "b767c2b75a0036edfc6be209dcaab23643887b192e3788640380ac27298b08d0";
   };
 
   buildNativeInputs = [ perl pkgconfig ];
-- 
cgit 1.4.1