From 0898de96874a146f3e3cc40d57239359bc86d3f7 Mon Sep 17 00:00:00 2001 From: carolili Date: Thu, 9 Feb 2017 19:52:05 +0000 Subject: [PATCH] gnu: slurm: Update to 16.05.9.1. * gnu/packages/parallel.scm (slurm): Update to 16.05.9.1. * gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch: Removing two contribs which are added in the new version. --- gnu/packages/parallel.scm | 4 ++-- .../slurm-configure-remove-nonfree-contribs.patch | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index a9ce2c929..1f8e68171 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -92,7 +92,7 @@ and they are executed on lists of files, hosts, users or other items.") (define-public slurm (package (name "slurm") - (version "15.08.7.1") + (version "16.05.9.1") (source (origin (method url-fetch) (uri (string-append @@ -101,7 +101,7 @@ and they are executed on lists of files, hosts, users or other items.") (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "1rmi35l4img00dr4vic8cv8s7b6n1yx1mkq2s7kjf5hvqdh6s2ki")) + "1zx5y2lyjknnca4aw7cbawn00mjhsqzy3h35w7s757cykfjqr8gv")) (patches (search-patches "slurm-configure-remove-nonfree-contribs.patch")) (modules '((guix build utils))) diff --git a/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch b/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch index b63d5bb01..4092261f7 100644 --- a/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch +++ b/gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch @@ -1,19 +1,19 @@ -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 +From 49d83e24a8e66977056fc9920812265c16806500 Mon Sep 17 00:00:00 2001 +From: carolili +Date: Thu, 9 Feb 2017 19:24:49 +0000 +Subject: [PATCH] Removing contribs --- - configure.ac | 20 -------------------- - 1 file changed, 20 deletions(-) + configure.ac | 22 ---------------------- + 1 file changed, 22 deletions(-) diff --git a/configure.ac b/configure.ac -index fedf354..e010732 100644 +index 1cf1051..5d76b44 100644 --- a/configure.ac +++ b/configure.ac -@@ -438,26 +438,6 @@ dnl All slurm Makefiles: +@@ -435,28 +435,6 @@ dnl All slurm Makefiles: + AC_CONFIG_FILES([Makefile - config.xml auxdir/Makefile - contribs/Makefile - contribs/cray/Makefile @@ -27,7 +27,9 @@ index fedf354..e010732 100644 - contribs/perlapi/libslurm/perl/Makefile.PL - contribs/perlapi/libslurmdb/Makefile - contribs/perlapi/libslurmdb/perl/Makefile.PL +- contribs/seff/Makefile - contribs/torque/Makefile +- contribs/openlava/Makefile - contribs/phpext/Makefile - contribs/phpext/slurm_php/config.m4 - contribs/sgather/Makefile @@ -39,5 +41,5 @@ index fedf354..e010732 100644 doc/man/Makefile doc/man/man1/Makefile -- -2.1.4 +2.11.0 -- 2.11.0