diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2005-12-13 15:14:42 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2005-12-13 15:14:42 +0000 |
| commit | 8863466ce7bfcb8cdd5357f8291f1aef7a46dec2 (patch) | |
| tree | a4ad35ed28deecd3340da6e5e1fed2b14e53c265 /pkgs/os-specific/linux/procps | |
| parent | 41047b0fc547ec5a1444fed066fd304cbd61def8 (diff) | |
| download | nixlib-8863466ce7bfcb8cdd5357f8291f1aef7a46dec2.tar nixlib-8863466ce7bfcb8cdd5357f8291f1aef7a46dec2.tar.gz nixlib-8863466ce7bfcb8cdd5357f8291f1aef7a46dec2.tar.bz2 nixlib-8863466ce7bfcb8cdd5357f8291f1aef7a46dec2.tar.lz nixlib-8863466ce7bfcb8cdd5357f8291f1aef7a46dec2.tar.xz nixlib-8863466ce7bfcb8cdd5357f8291f1aef7a46dec2.tar.zst nixlib-8863466ce7bfcb8cdd5357f8291f1aef7a46dec2.zip | |
don't build "kill", update to 3.2.6
svn path=/nixpkgs/trunk/; revision=4363
Diffstat (limited to 'pkgs/os-specific/linux/procps')
| -rw-r--r-- | pkgs/os-specific/linux/procps/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/procps/procps-no-kill.patch | 12 |
2 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/procps/default.nix b/pkgs/os-specific/linux/procps/default.nix index a5be0ca1a2f6..8fdc141916b8 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 000000000000..028fc110a639 --- /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 \ |