Re: [PATCH] gnu: Add slurm.

[Pjotr Prins <pjotr.public12@thebird.nl>]

[-- Attachment #1: Type: text/plain, Size: 194 bytes --]

Another package name (this time we go down to slurm), another patch.
I also put the modules in alphabetic order when adding the license
name space. Hope that doesn't need a separate patch.

Pj.

[-- Attachment #2: 0001-gnu-Add-slurm.patch --]
[-- Type: text/x-diff, Size: 5948 bytes --]

From ef998204cde384d35b605509be09b25170c28fb8 Mon Sep 17 00:00:00 2001
From: Pjotr Prins <pjotr.public01@thebird.nl>
Date: Sat, 13 Feb 2016 09:45:30 +0100
Subject: [PATCH] gnu: Add slurm.

* gnu/packages/parallel.scm (slurm): New variable.
* gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch: New file.
* gnu/packages/parallel.scm (parallel): Introduce license name space.
---
 gnu/packages/parallel.scm                          | 67 ++++++++++++++++++++--
 ...urm-wlm-configure-remove-nonfree-contribs.patch | 43 ++++++++++++++
 2 files changed, 105 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch

diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm
index 8f63bda..a52e554 100644
--- a/gnu/packages/parallel.scm
+++ b/gnu/packages/parallel.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2013,2014 Eric Bavier <bavier@member.fsf.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016 Pjotr Prins <pjotr.guix@thebird.nl>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -19,12 +20,18 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu packages parallel)
-  #:use-module (guix packages)
-  #:use-module (guix licenses)
-  #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
   #: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))
 
 (define-public parallel
   (package
@@ -46,4 +53,54 @@
      "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
+  (package
+   (name "slurm")
+   (version "15.08.7.1")
+   (source (origin
+            (method url-fetch)
+            (uri (string-append "https://github.com/SchedMD/slurm/archive/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-nonfree-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)))
+   (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 patched
+       (add-before
+        'autogen 'rewrite-usr-bin
+        (lambda* (#:key inputs #:allow-other-keys)
+                 ;; replace python call with python3
+                 (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-contribs.patch b/gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch
new file mode 100644
index 0000000..b63d5bb
--- /dev/null
+++ b/gnu/packages/patches/slurm-wlm-configure-remove-nonfree-contribs.patch
@@ -0,0 +1,43 @@
+From 53eda9102b969a4be2882cea4befee03591a7436 Mon Sep 17 00:00:00 2001
+From: Pjotr Prins <pjotr.public01@thebird.nl>
+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
+-- 
+2.1.4
+
-- 
2.1.4