diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:19:05 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-08-24 08:55:37 +0200 |
commit | 2e6bf42a2207d5ecfe6e67de2def6e004a0eb1f1 (patch) | |
tree | 36de0660dc2c9f3731bd8b60ec852ca0c452efce /pkgs/servers/computing | |
parent | 84a91208a948be5eca97ea182c4256d9d6ecf171 (diff) | |
parent | 8943fb5f24b9e1aa1d577be4e214d166643269fd (diff) |
Merge branch 'master' into staging-next
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
Diffstat (limited to 'pkgs/servers/computing')
-rw-r--r-- | pkgs/servers/computing/torque/default.nix | 67 |
1 files changed, 42 insertions, 25 deletions
diff --git a/pkgs/servers/computing/torque/default.nix b/pkgs/servers/computing/torque/default.nix index 35c830dff8a5..5e78fe742ac3 100644 --- a/pkgs/servers/computing/torque/default.nix +++ b/pkgs/servers/computing/torque/default.nix @@ -1,46 +1,62 @@ -{ stdenv, fetchurl, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux -, file, libtool, which }: +{ stdenv, fetchFromGitHub, openssl, flex, bison, pkgconfig, groff, libxml2, utillinux +, file, libtool, which, boost, autoreconfHook +}: stdenv.mkDerivation rec { - name = "torque-4.2.10"; + pname = "torque"; + version = "6.1.3h2"; - src = fetchurl { - name = "${name}.tar.gz"; - url = "http://www.adaptivecomputing.com/index.php?wpfb_dl=2880"; - sha256 = "1qpsk3bla6b6m7m0i1xpr183yj79liy3p34xhnz1grgq0776wg5l"; + src = fetchFromGitHub { + owner = "adaptivecomputing"; + repo = pname; + # branch 6.1.3h2, as they aren't pushing tags + # https://github.com/adaptivecomputing/torque/issues/467 + rev = "458883319157cfc5c509046d09f9eb8e68e8d398"; + sha256 = "1b56bc5j9wg87kcywzmhf7234byyrwax9v1pqsr9xmv2x7saakrr"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl flex bison groff libxml2 utillinux libtool - which ]; + strictDeps = true; + nativeBuildInputs = [ autoreconfHook pkgconfig flex bison libxml2 ]; + buildInputs = [ + openssl groff libxml2 utillinux libtool + which boost + ]; enableParallelBuilding = true; # added to fix build with gcc7 - NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; + NIX_CFLAGS_COMPILE = [ + "-Wno-error" "-fpermissive" + ]; + + postPatch = '' + substituteInPlace Makefile.am \ + --replace "contrib/init.d contrib/systemd" "" + substituteInPlace src/cmds/Makefile.am \ + --replace "/etc/" "$out/etc/" + ''; preConfigure = '' - substituteInPlace ./configure \ - --replace '/usr/bin/file' '${file}/bin/file' + substituteInPlace ./configure \ + --replace '/usr/bin/file' '${file}/bin/file' - # fix broken libxml2 detection - sed -i '/xmlLib\=/c\xmlLib=xml2' ./configure + # 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/" - done + 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/" + done - for f in $(find ./ -name Makefile.in); do - echo patching $f... - sed -i $f -e '/PBS_MKDIRS/d' -e '/chmod u+s/d' - done + for f in $(find ./ -name Makefile.in); do + echo patching $f... + sed -i $f -e '/PBS_MKDIRS/d' -e '/chmod u+s/d' + done + patchShebangs buildutils ''; postInstall = '' - mv $out/sbin/* $out/bin/ - rmdir $out/sbin cp -v buildutils/pbs_mkdirs $out/bin/ cp -v torque.setup $out/bin/ chmod +x $out/bin/pbs_mkdirs $out/bin/torque.setup @@ -50,5 +66,6 @@ stdenv.mkDerivation rec { homepage = http://www.adaptivecomputing.com/products/open-source/torque; description = "Resource management system for submitting and controlling jobs on supercomputers, clusters, and grids"; platforms = platforms.linux; + license = "TORQUEv1.1"; }; } |