all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
* [PATCH] gnu: Add slurm.
@ 2016-02-13 17:22 Pjotr Prins
  2016-02-13 17:30 ` Andreas Enge
  0 siblings, 1 reply; 29+ messages in thread
From: Pjotr Prins @ 2016-02-13 17:22 UTC (permalink / raw)
  To: guix-devel

* 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-system.am                                      |  1 +
 gnu/packages/parallel.scm                          | 67 ++++++++++++++++++++--
 .../slurm-configure-remove-nonfree-contribs.patch  | 43 ++++++++++++++
 3 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch

diff --git a/gnu-system.am b/gnu-system.am
index fd9795e..ac4b241 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -702,6 +702,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/slim-session.patch			\
   gnu/packages/patches/slim-config.patch			\
   gnu/packages/patches/slim-sigusr1.patch			\
+  gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch    \
   gnu/packages/patches/soprano-find-clucene.patch		\
   gnu/packages/patches/sudo-CVE-2015-5602.patch			\
   gnu/packages/patches/superlu-dist-scotchmetis.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-configure-remove-nonfree-contribs.patch b/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch
new file mode 100644
index 0000000..b63d5bb
--- /dev/null
+++ b/gnu/packages/patches/slurm-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

^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [PATCH] gnu: Add slurm.
@ 2016-02-13 17:21 Pjotr Prins
  0 siblings, 0 replies; 29+ messages in thread
From: Pjotr Prins @ 2016-02-13 17:21 UTC (permalink / raw)
  To: guix-devel

* 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-system.am                                      |  1 +
 gnu/packages/parallel.scm                          | 67 ++++++++++++++++++++--
 .../slurm-configure-remove-nonfree-contribs.patch  | 43 ++++++++++++++
 3 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch

diff --git a/gnu-system.am b/gnu-system.am
index fd9795e..ac4b241 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -702,6 +702,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/slim-session.patch			\
   gnu/packages/patches/slim-config.patch			\
   gnu/packages/patches/slim-sigusr1.patch			\
+  gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch    \
   gnu/packages/patches/soprano-find-clucene.patch		\
   gnu/packages/patches/sudo-CVE-2015-5602.patch			\
   gnu/packages/patches/superlu-dist-scotchmetis.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-configure-remove-nonfree-contribs.patch b/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch
new file mode 100644
index 0000000..b63d5bb
--- /dev/null
+++ b/gnu/packages/patches/slurm-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

^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [PATCH] gnu: Add slurm.
@ 2016-02-13 17:21 Pjotr Prins
  0 siblings, 0 replies; 29+ messages in thread
From: Pjotr Prins @ 2016-02-13 17:21 UTC (permalink / raw)
  To: guix-devel

* 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-system.am                                      |  1 +
 gnu/packages/parallel.scm                          | 67 ++++++++++++++++++++--
 .../slurm-configure-remove-nonfree-contribs.patch  | 43 ++++++++++++++
 3 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch

diff --git a/gnu-system.am b/gnu-system.am
index fd9795e..ac4b241 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -702,6 +702,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/slim-session.patch			\
   gnu/packages/patches/slim-config.patch			\
   gnu/packages/patches/slim-sigusr1.patch			\
+  gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch    \
   gnu/packages/patches/soprano-find-clucene.patch		\
   gnu/packages/patches/sudo-CVE-2015-5602.patch			\
   gnu/packages/patches/superlu-dist-scotchmetis.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-configure-remove-nonfree-contribs.patch b/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch
new file mode 100644
index 0000000..b63d5bb
--- /dev/null
+++ b/gnu/packages/patches/slurm-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

^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [PATCH] gnu: Add slurm.
@ 2016-02-13 17:18 Pjotr Prins
  0 siblings, 0 replies; 29+ messages in thread
From: Pjotr Prins @ 2016-02-13 17:18 UTC (permalink / raw)
  To: guix-devel

* 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-system.am                                      |  1 +
 gnu/packages/parallel.scm                          | 67 ++++++++++++++++++++--
 .../slurm-configure-remove-nonfree-contribs.patch  | 43 ++++++++++++++
 3 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch

diff --git a/gnu-system.am b/gnu-system.am
index fd9795e..ac4b241 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -702,6 +702,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/slim-session.patch			\
   gnu/packages/patches/slim-config.patch			\
   gnu/packages/patches/slim-sigusr1.patch			\
+  gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch    \
   gnu/packages/patches/soprano-find-clucene.patch		\
   gnu/packages/patches/sudo-CVE-2015-5602.patch			\
   gnu/packages/patches/superlu-dist-scotchmetis.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-configure-remove-nonfree-contribs.patch b/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch
new file mode 100644
index 0000000..b63d5bb
--- /dev/null
+++ b/gnu/packages/patches/slurm-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

^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [PATCH] gnu: Add slurm.
@ 2016-02-13 17:14 Pjotr Prins
  0 siblings, 0 replies; 29+ messages in thread
From: Pjotr Prins @ 2016-02-13 17:14 UTC (permalink / raw)
  To: guix-devel

* 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-system.am                                      |  1 +
 gnu/packages/parallel.scm                          | 67 ++++++++++++++++++++--
 .../slurm-configure-remove-nonfree-contribs.patch  | 43 ++++++++++++++
 3 files changed, 106 insertions(+), 5 deletions(-)
 create mode 100644 gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch

diff --git a/gnu-system.am b/gnu-system.am
index fd9795e..ac4b241 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -702,6 +702,7 @@ dist_patch_DATA =						\
   gnu/packages/patches/slim-session.patch			\
   gnu/packages/patches/slim-config.patch			\
   gnu/packages/patches/slim-sigusr1.patch			\
+  gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch    \
   gnu/packages/patches/soprano-find-clucene.patch		\
   gnu/packages/patches/sudo-CVE-2015-5602.patch			\
   gnu/packages/patches/superlu-dist-scotchmetis.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-configure-remove-nonfree-contribs.patch b/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch
new file mode 100644
index 0000000..b63d5bb
--- /dev/null
+++ b/gnu/packages/patches/slurm-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

^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [PATCH] gnu: Add slurm-llnl.
@ 2016-02-10 17:36 Pjotr Prins
  2016-02-11  4:04 ` Eric Bavier
  0 siblings, 1 reply; 29+ messages in thread
From: Pjotr Prins @ 2016-02-10 17:36 UTC (permalink / raw)
  To: guix-devel

* 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 <bavier@member.fsf.org>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Efraim Flashner <efraim@flashner.co.il>
-;;;
+;;; Copyright © 2014, 2015 Pjotr Prins <pjotr.guix@thebird.nl>
+
 ;;; 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+)))
+
+(define-public slurm-llnl
+  (package
+   (name "slurm-llnl")
+   (version "15-08-6-1")
+   (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"))))
+                 (substitute* "src/common/env.c"
+                              (("/usr/bin/env") (which "env"))))))))
+   (home-page "http://www.schedmd.com/")
+   (synopsis "Tool for cluster computing")
+   (description
+    "Fault-tolerant, and highly scalable cluster management and job
+scheduling system for large and small clusters.")
+   (license license:openssl)))
-- 
2.5.0

^ permalink raw reply related	[flat|nested] 29+ messages in thread
* [PATCH] gnu: Add slurm
@ 2015-12-28 22:00 swedebugia
  2015-12-28 23:13 ` Eric Bavier
  2015-12-29  4:31 ` Leo Famulari
  0 siblings, 2 replies; 29+ messages in thread
From: swedebugia @ 2015-12-28 22:00 UTC (permalink / raw)
  To: guix-devel

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

My first patch ever to a software project. How did I do?
If okay I would like to avoid providing my legal name.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-slurm.patch --]
[-- Type: text/x-diff; name=0001-gnu-Add-slurm.patch, Size: 1798 bytes --]

From 53832a06a61801e9996252506aacad468d54f071 Mon Sep 17 00:00:00 2001
From: swedebugia <swedebugia@riseup.net>
Date: Mon, 28 Dec 2015 15:04:21 +0100
Subject: [PATCH] gnu: Add slurm

---
 gnu/packages/networking.scm | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 0a7cde0..d84551d 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2015 Ricardo Wurmus <rekado@elephly.net>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;; Copyright © 2015 Stefan Reichör <stefan@xsteve.at>
+;;; Copyright © 2015 swedebugia <swedebugia@riseup.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -187,3 +188,23 @@ needed/wanted real-time traffic statistics of multiple network
 interfaces, with a simple and efficient view on the command line.  It is
 intended as a substitute for the PPPStatus and EthStatus projects.")
     (license license:gpl2+)))
+
+(define-public slurm
+  (package
+    (name "slurm")
+    (version "0.4.3")
+    (source
+     (origin
+      (method url-fetch)
+      (uri (string-append "https://github.com/mattthias/slurm/archive/upstream/"
+                          version ".tar.gz"))
+      (sha256
+       (base32
+        "1b53sckvg1j8510gi4bc48q61191jcc1nvhp5k8f2ywj2p9c0q5r"))))
+    (build-system gnu-build-system)
+     (inputs `(("ncurses" ,ncurses)
+    (home-page "https://github.com/mattthias/slurm")
+    (synopsis "yet another network load monitor")
+    (description
+     "slurm is a generic network load monitor for *BSD, Linux, HP-UX and Solaris. It features 3 graph modes with curses ascii graphics, traffic statistics and works on any interface supported by the kernel.")
+    (license gpl2+)))
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 29+ messages in thread

end of thread, other threads:[~2016-02-16  9:55 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-13 17:22 [PATCH] gnu: Add slurm Pjotr Prins
2016-02-13 17:30 ` Andreas Enge
2016-02-13 17:47   ` Ooops: " Pjotr Prins
  -- strict thread matches above, loose matches on Subject: below --
2016-02-13 17:21 Pjotr Prins
2016-02-13 17:21 Pjotr Prins
2016-02-13 17:18 Pjotr Prins
2016-02-13 17:14 Pjotr Prins
2016-02-10 17:36 [PATCH] gnu: Add slurm-llnl Pjotr Prins
2016-02-11  4:04 ` Eric Bavier
2016-02-11  8:15   ` Pjotr Prins
2016-02-12 12:20     ` Pjotr Prins
2016-02-12 12:30       ` Andreas Enge
2016-02-12 12:31         ` Pjotr Prins
2016-02-12 12:57           ` [PATCH] gnu: Add slurm-wlm Pjotr Prins
2016-02-13  8:59             ` [PATCH] gnu: Add slurm Pjotr Prins
2016-02-13 10:28               ` Andreas Enge
2016-02-13 16:42                 ` Pjotr Prins
2016-02-13 17:00                   ` Andreas Enge
2016-02-13 17:01                   ` Pjotr Prins
2016-02-13 17:20                     ` Andreas Enge
2016-02-13 20:13                       ` Leo Famulari
2016-02-13 20:34                         ` Andreas Enge
2016-02-13 20:40                           ` Leo Famulari
2016-02-14 14:22                             ` Andreas Enge
2016-02-14 19:08                               ` Leo Famulari
2016-02-15 12:09                                 ` Pjotr Prins
2016-02-15 21:51                                   ` Andreas Enge
2016-02-16  7:21                                     ` Pjotr Prins
2016-02-16  9:55                                       ` Andreas Enge
2016-02-13 20:38                         ` Leo Famulari
2016-02-13 21:32                           ` Pjotr Prins
2016-02-13 21:43                             ` Leo Famulari
2016-02-13 17:13                 ` Pjotr Prins
2015-12-28 22:00 swedebugia
2015-12-28 23:13 ` Eric Bavier
2015-12-29  4:31 ` Leo Famulari

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.