From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pjotr Prins Subject: Re: [PATCH] gnu: Add slurm-llnl. Date: Fri, 12 Feb 2016 13:30:23 +0100 Message-ID: <20160212123023.GA14324@thebird.nl> References: <56bb7530.v5bvas2QpzoMjKMl%pjotr.public12@thebird.nl> <20160210220447.0917f1a1@openmailbox.org> <20160211081534.GA8987@thebird.nl> <20160211100801.GA6109@debian.eduroam.u-bordeaux.fr> <20160211111127.GA9815@thebird.nl> <20160211142121.GA4136@debian.bordeaux.inria.fr> <20160211150038.GA10474@thebird.nl> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="a8Wt8u1KmwUX3Y2C" Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUCsb-0003uw-Uf for guix-devel@gnu.org; Fri, 12 Feb 2016 07:31:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aUCsY-0000Sk-7E for guix-devel@gnu.org; Fri, 12 Feb 2016 07:31:21 -0500 Received: from mail.thebird.nl ([95.154.246.10]:45612) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aUCsX-0000Se-Vr for guix-devel@gnu.org; Fri, 12 Feb 2016 07:31:18 -0500 Content-Disposition: inline In-Reply-To: <20160211150038.GA10474@thebird.nl> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: Pjotr Prins Cc: guix-devel@gnu.org --a8Wt8u1KmwUX3Y2C Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hopefully taken all comments into account. For better or for worse, at least this works. Pj. --a8Wt8u1KmwUX3Y2C Content-Type: text/x-diff; charset=iso-8859-1 Content-Disposition: attachment; filename="0001-gnu-Add-slurm-wlm.patch" Content-Transfer-Encoding: quoted-printable >From 5941b6b2624ee18444c2fa9f0805136cf6924a88 Mon Sep 17 00:00:00 2001 From: Pjotr Prins Date: Fri, 12 Feb 2016 13:26:56 +0100 Subject: [PATCH] gnu: Add slurm-wlm. * gnu/packages/parallel.scm (slurm-wlm): New variable. --- gnu/packages/parallel.scm | 67 ++++++++++++++++= +++++- ...urm-wlm-configure-remove-nonfree-contribs.patch | 43 ++++++++++++++ 2 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/slurm-wlm-configure-remove-nonfr= ee-contribs.patch diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 8f63bda..a3e69b3 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -2,6 +2,7 @@ ;;; Copyright =A9 2013,2014 Eric Bavier ;;; Copyright =A9 2015 Mark H Weaver ;;; Copyright =A9 2015 Efraim Flashner +;;; Copyright =A9 2016 Pjotr Prins ;;; ;;; This file is part of GNU Guix. ;;; @@ -20,11 +21,18 @@ =20 (define-module (gnu packages parallel) #:use-module (guix packages) - #:use-module (guix licenses) #:use-module (guix download) + #:use-module ((guix licenses) #:prefix license:) #:use-module (guix build-system gnu) + ;; #:use-module (guix utils) #:use-module (gnu packages) - #:use-module (gnu packages perl)) + #:use-module (gnu packages admin) + #:use-module (gnu packages autotools) + #:use-module (gnu packages linux) + #:use-module (gnu packages perl) + #:use-module (gnu packages python) + #:use-module (gnu packages tcl) + #:use-module (gnu packages tls)) =20 (define-public parallel (package @@ -46,4 +54,57 @@ "GNU Parallel is a tool for executing shell jobs in parallel using = one or more computers. Jobs can consist of single commands or of scripts and they are executed on lists of files, hosts, users or other items.") - (license gpl3+))) + (license license:gpl3+))) + +(define-public slurm-wlm + (package + (name "slurm-wlm") + (version "15.08.7.1") + (source (origin + (method url-fetch) + ;; https://github.com/SchedMD/slurm/archive/slurm-15-08-7-1.= tar.gz + (uri (string-append "https://github.com/SchedMD/slurm/archiv= e/slurm-" + (string-join (string-split version #\.) = "-") ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "1rmi35l4img00dr4vic8cv8s7b6n1yx1mkq2s7kjf5hvqdh6s2ki")) + (patches (list (search-patch "slurm-wlm-configure-remove-non= free-contribs.patch"))) + (modules '((guix build utils))) + (snippet + '(begin + (delete-file-recursively "contribs") + #t)))) + + (inputs `(("openssl" ,openssl) + ("munge" ,munge) + ("perl" ,perl) + ("expect" ,expect) + ("python" ,python) + ("linux-pam" , linux-pam))) + (native-inputs + `(("autoconf" ,autoconf) + ;; ("automake" ,automake) + )) + (build-system gnu-build-system) + (arguments + `(#:configure-flags '("--enable-pam") + #:phases + (modify-phases %standard-phases + (add-before + 'configure 'autogen + (lambda _ (zero? (system* "autoconf")))) ; configure.ac was patc= hed + (add-before + 'autogen 'rewrite-usr-bin + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "./doc/html/shtml2html.py" + (("#!/usr/bin/env python") + (string-append "#!" (which "python3")))) + (substitute* "src/common/env.c" + (("/usr/bin/env") (which "env")))))))) + (home-page "http://slurm.schedmd.com/") + (synopsis "Workload manager for cluster computing") + (description + "Fault-tolerant and highly scalable cluster management and job +scheduling system for large and small clusters.") + (license license:gpl2+))) diff --git a/gnu/packages/patches/slurm-wlm-configure-remove-nonfree-cont= ribs.patch b/gnu/packages/patches/slurm-wlm-configure-remove-nonfree-cont= ribs.patch new file mode 100644 index 0000000..b63d5bb --- /dev/null +++ b/gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.pa= tch @@ -0,0 +1,43 @@ +From 53eda9102b969a4be2882cea4befee03591a7436 Mon Sep 17 00:00:00 2001 +From: Pjotr Prins +Date: Fri, 12 Feb 2016 12:43:33 +0100 +Subject: [PATCH] Remove contribs + +--- + configure.ac | 20 -------------------- + 1 file changed, 20 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fedf354..e010732 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -438,26 +438,6 @@ dnl All slurm Makefiles: + AC_CONFIG_FILES([Makefile + config.xml + auxdir/Makefile +- contribs/Makefile +- contribs/cray/Makefile +- contribs/cray/csm/Makefile +- contribs/lua/Makefile +- contribs/mic/Makefile +- contribs/pam/Makefile +- contribs/pam_slurm_adopt/Makefile +- contribs/perlapi/Makefile +- contribs/perlapi/libslurm/Makefile +- contribs/perlapi/libslurm/perl/Makefile.PL +- contribs/perlapi/libslurmdb/Makefile +- contribs/perlapi/libslurmdb/perl/Makefile.PL +- contribs/torque/Makefile +- contribs/phpext/Makefile +- contribs/phpext/slurm_php/config.m4 +- contribs/sgather/Makefile +- contribs/sgi/Makefile +- contribs/sjobexit/Makefile +- contribs/slurmdb-direct/Makefile +- contribs/pmi2/Makefile + doc/Makefile + doc/man/Makefile + doc/man/man1/Makefile +--=20 +2.1.4 + --=20 2.1.4 --a8Wt8u1KmwUX3Y2C--