public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pdsh: updated to version 2.18

Browse Source 
svn path=/nixpkgs/trunk/; revision=14731
This commit is contained in:
Peter Simons 2009-03-26 19:17:42 +00:00
parent 5a8a90cd56
commit 33089fcfdd
3 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/networking/pdsh/default.nix
View File

@ -1,7 +1,7 @@
{stdenv, fetchurl, perl, readline, ssh, pam}: {stdenv, fetchurl, perl, readline, rsh, ssh, pam}:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "pdsh-2.16"; name = "pdsh-2.18";
meta = { meta = {
homepage = "https://computing.llnl.gov/linux/pdsh.html"; homepage = "https://computing.llnl.gov/linux/pdsh.html";
description = "A high-performance, parallel remote shell utility."; description = "A high-performance, parallel remote shell utility.";
@ -9,9 +9,8 @@ stdenv.mkDerivation rec {
}; };
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pdsh/${name}.tar.bz2"; url = "mirror://sourceforge/pdsh/${name}.tar.bz2";
sha256 = "8891cd3b175d3075f7c71fa4ee2b077306117ada5dd8c0966caaa3b74eca3a3e"; sha256 = "8c94acb17b4af8a9f553db180b4d5745c9c98844a5dc070e2ce80590e8e8a539";
}; };
patches = [ ./fix-missing-sys-types-h.patch ];
buildInputs = [perl readline ssh pam]; buildInputs = [perl readline ssh pam];
# Setting --with-machines=$out in configureFlags doesn't seem to work, # Setting --with-machines=$out in configureFlags doesn't seem to work,
# so I specify configurePhase instead. # so I specify configurePhase instead.
@ -19,6 +18,7 @@ stdenv.mkDerivation rec {
+ " " + (if readline == null then "--without-readline" else "--with-readline") + " " + (if readline == null then "--without-readline" else "--with-readline")
+ " " + (if ssh == null then "--without-ssh" else "--with-ssh") + " " + (if ssh == null then "--without-ssh" else "--with-ssh")
+ " " + (if pam == null then "--without-pam" else "--with-pam") + " " + (if pam == null then "--without-pam" else "--with-pam")
+ " " + (if rsh == null then "--without-rsh" else "--with-rsh")
+ " --with-dshgroups" + " --with-dshgroups"
+ " --with-xcpu" + " --with-xcpu"
+ " --without-genders" + " --without-genders"

11
pkgs/tools/networking/pdsh/fix-missing-sys-types-h.patch
View File

@ -1,11 +0,0 @@
--- pdsh-2.16/src/common/hostlist.h 2008-01-29 18:35:48.000000000 +0100
+++ pdsh-2.16-patched/src/common/hostlist.h 2008-07-07 21:14:12.000000000 +0200
@@ -29,6 +29,8 @@
#ifndef _HOSTLIST_H
#define _HOSTLIST_H
+#include <sys/types.h>
+
/* Notes:
*
* If WITH_LSD_FATAL_ERROR_FUNC is defined, the linker will expect to

1
pkgs/top-level/all-packages.nix
View File

@ -1086,6 +1086,7 @@ let
pdsh = import ../tools/networking/pdsh { pdsh = import ../tools/networking/pdsh {
inherit fetchurl stdenv perl; inherit fetchurl stdenv perl;
readline = if getPkgConfig "pdsh" "readline" true then readline else null; readline = if getPkgConfig "pdsh" "readline" true then readline else null;
rsh = getPkgConfig "pdsh" "rsh" true;
ssh = if getPkgConfig "pdsh" "ssh" true then openssh else null; ssh = if getPkgConfig "pdsh" "ssh" true then openssh else null;
pam = if getPkgConfig "pdsh" "pam" true then pam else null; pam = if getPkgConfig "pdsh" "pam" true then pam else null;
}; };