mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
torque: update from 4.2.8 to 4.2.10, fixes CVE-2014-3684
This commit is contained in:
parent
643c515489
commit
080dc99df7
@ -1,19 +1,27 @@
|
||||
{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux }:
|
||||
{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux
|
||||
, file, libtool, which }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "torque-4.2.8";
|
||||
name = "torque-4.2.10";
|
||||
|
||||
src = fetchurl {
|
||||
name = "${name}.tar.gz";
|
||||
url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2730";
|
||||
sha256 = "1sjpvndzm9ccdmfwdf9887ppmapawfsh5qdkzr92kadg5jxp796j";
|
||||
url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2880";
|
||||
sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l";
|
||||
};
|
||||
|
||||
buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux ];
|
||||
buildInputs = [ openssl flex bison pkgconfig groff libxml2 utillinux libtool
|
||||
which ];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preConfigure = ''
|
||||
substituteInPlace ./configure \
|
||||
--replace '/usr/bin/file' '${file}/bin/file'
|
||||
|
||||
# fix broken libxml2 detection
|
||||
sed -i '/xmlLib\=/c\xmlLib=xml2' ./configure
|
||||
|
||||
for s in fifo cray_t3e dec_cluster msic_cluster sgi_origin umn_cluster; do
|
||||
substituteInPlace src/scheduler.cc/samples/$s/Makefile.in \
|
||||
--replace "schedprivdir = " "schedprivdir = $out/"
|
||||
|
Loading…
Reference in New Issue
Block a user