On Wed, 10 Feb 2016 18:36:48 +0100 Pjotr Prins <pjotr.publi...@thebird.nl> wrote:
> * gnu/packages/parallel.scm (slurm-llnl): New variable. > --- > gnu/packages/parallel.scm | 51 > ++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 48 insertions(+), 3 deletions(-) > > diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm > index 8f63bda..03ee460 100644 > --- a/gnu/packages/parallel.scm > +++ b/gnu/packages/parallel.scm > @@ -2,7 +2,8 @@ > ;;; Copyright © 2013,2014 Eric Bavier <bav...@member.fsf.org> > ;;; Copyright © 2015 Mark H Weaver <m...@netris.org> > ;;; Copyright © 2015 Efraim Flashner <efr...@flashner.co.il> > -;;; > +;;; Copyright © 2014, 2015 Pjotr Prins <pjotr.g...@thebird.nl> > + Remove this extra whitespace.http://www.schedmd.com/ > ;;; This file is part of GNU Guix. > ;;; > ;;; GNU Guix is free software; you can redistribute it and/or modify it > @@ -20,11 +21,17 @@ > > (define-module (gnu packages parallel) > #:use-module (guix packages) > - #:use-module (guix licenses) > #:use-module (guix download) > + #:use-module (guix licenses) > + #:use-module ((guix licenses) #:prefix license:) > #:use-module (guix build-system gnu) > #:use-module (gnu packages) > - #:use-module (gnu packages perl)) > + #:use-module (gnu packages admin) > + #: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)) > > (define-public parallel > (package > @@ -47,3 +54,41 @@ > 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+))) ^ With the new 'license:' symbol prefix, all other licenses need to be adjusted. > + > +(define-public slurm-llnl > + (package > + (name "slurm-llnl") I think we should rather use "slurm-wlm" if we are trying to dissambiguate with the "Slurm the Realtime network interface monitor". > + (version "15-08-6-1") Version 15.08.7 is now available. I would prefer we use '.'s to separate version number components, and compute the uri string appropriately. > + (source (origin > + (method url-fetch) > + (uri (string-append > "https://github.com/SchedMD/slurm/archive/slurm-" > + version ".tar.gz")) > + (file-name (string-append name "-" version ".tar.gz")) > + (sha256 > + (base32 > + "1h8al21blmrhma9r7qxkba2g5i74m3hrjc9a640j7px54szvg18v")))) > + (inputs `(("openssl" ,openssl) > + ("munge" ,munge) > + ("perl" ,perl) > + ("expect" ,expect) > + ("python" ,python) > + ("linux-pam" , linux-pam))) > + (build-system gnu-build-system) > + (arguments > + `(#:configure-flags '("--enable-pam") > + #:phases > + (modify-phases %standard-phases > + (add-before > + 'configure 'rewrite-usr-bin > + (lambda* (#:key inputs #:allow-other-keys) > + (substitute* "./doc/html/shtml2html.py" > + (("#!/usr/bin/env python") > + (string-append "#!" (which "python3")))) Is this shebang not handled by the patch-shebangs phase? > + (substitute* "src/common/env.c" > + (("/usr/bin/env") (which "env")))))))) > + (home-page "http://www.schedmd.com/") How about "http://slurm.schedmd.com/"? > + (synopsis "Tool for cluster computing") How about "Workload manager" to indicate what the tool does. > + (description > + "Fault-tolerant, and highly scalable cluster management and job > +scheduling system for large and small clusters.") > + (license license:openssl))) According to the "License" section at http://www.schedmd.com/#repos and the COPYING file, it's GPLv2. `~Eric