From 8863466ce7bfcb8cdd5357f8291f1aef7a46dec2 Mon Sep 17 00:00:00 2001 From: Armijn Hemel Date: Tue, 13 Dec 2005 15:14:42 +0000 Subject: don't build "kill", update to 3.2.6 svn path=/nixpkgs/trunk/; revision=4363 --- pkgs/os-specific/linux/procps/default.nix | 8 ++++---- pkgs/os-specific/linux/procps/procps-no-kill.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/procps/procps-no-kill.patch diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix index a5be0ca1a2f..8fdc141916b 100644 --- a/pkgs/os-specific/linux/procps/default.nix +++ b/pkgs/os-specific/linux/procps/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ncurses}: stdenv.mkDerivation { - name = "procps-3.2.5"; + name = "procps-3.2.6"; builder = ./builder.sh; src = fetchurl { - url = http://procps.sourceforge.net/procps-3.2.5.tar.gz; - md5 = "cde0e3612d1d7c68f404d46f01c44fb4"; + url = http://procps.sourceforge.net/procps-3.2.6.tar.gz; + md5 = "7ce39ea27d7b3da0e8ad74dd41d06783"; }; - patches = [./makefile.patch]; + patches = [./makefile.patch ./procps-no-kill.patch]; buildInputs = [ncurses]; } diff --git a/pkgs/os-specific/linux/procps/procps-no-kill.patch b/pkgs/os-specific/linux/procps/procps-no-kill.patch new file mode 100644 index 00000000000..028fc110a63 --- /dev/null +++ b/pkgs/os-specific/linux/procps/procps-no-kill.patch @@ -0,0 +1,12 @@ +diff -ruN procps-3.2.6/Makefile procps-3.2.6.new/Makefile +--- procps-3.2.6/Makefile 2005-10-30 07:27:04.000000000 +0100 ++++ procps-3.2.6.new/Makefile 2005-12-13 16:11:40.000000000 +0100 +@@ -43,7 +43,7 @@ + usr/lib := $(DESTDIR)/usr/$(lib64)/ + usr/include := $(DESTDIR)/usr/include/ + +-#SKIP := $(bin)kill $(man1)kill.1 ++SKIP := $(bin)kill $(man1)kill.1 + + BINFILES := $(usr/bin)uptime $(usr/bin)tload $(usr/bin)free $(usr/bin)w \ + $(usr/bin)top $(usr/bin)vmstat $(usr/bin)watch $(usr/bin)skill \ -- cgit 1.4.1