From 4ff22ec3b16a90b140721aa10c94c595ccb2c390 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jan 2018 19:18:26 +0100 Subject: gnu: slurm: Update to 17.11.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/parallel.scm (slurm): Update to 17.11.2. [source]: Replace patch with less fragile SUBSTITUTE* in a snippet. [arguments]: Rename ‘autogen’ phase to ‘autoconf’. Use INVOKE. * gnu/packages/patches/slurm-configure-remove-nonfree-contribs.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it. --- gnu/packages/parallel.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'gnu/packages/parallel.scm') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index cc6542e853..2ec866f5f6 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2016 Ben Woodcroft ;;; Copyright © 2017 Rutger Helling +;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,7 +94,7 @@ and they are executed on lists of files, hosts, users or other items.") (define-public slurm (package (name "slurm") - (version "16.05.11") + (version "17.11.2") (source (origin (method url-fetch) (uri (string-append @@ -101,12 +102,12 @@ and they are executed on lists of files, hosts, users or other items.") version ".tar.bz2")) (sha256 (base32 - "0c63mvh13wsp6jlydaz98v35iwg53mk94ynpx9dqn2z4gl53k5y7")) - (patches (search-patches - "slurm-configure-remove-nonfree-contribs.patch")) + "18yakb8kmhb16n0cv3zhjv8ahvsk9p0max8mmr2flb2c65fawks6")) (modules '((guix build utils))) (snippet '(begin + (substitute* "configure.ac" + (("^[[:space:]]+contribs/.*$") "")) (delete-file-recursively "contribs") #t)))) ;; FIXME: More optional inputs could be added, @@ -136,8 +137,8 @@ and they are executed on lists of files, hosts, users or other items.") (string-append "--with-ssl=" (assoc-ref %build-inputs "openssl"))) #:phases (modify-phases %standard-phases - (add-after 'unpack 'autogen - (lambda _ (zero? (system* "autoconf"))))))) ; configure.ac was patched + (add-after 'unpack 'autoconf + (lambda _ (invoke "autoconf")))))) ; configure.ac was patched (home-page "http://slurm.schedmd.com/") (synopsis "Workload manager for cluster computing") (description -- cgit 1.4.1 From 912575870825de2495de912d6c0a5f1c1e1b52dc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jan 2018 19:22:15 +0100 Subject: gnu: slurm: Use HTTPS for home page. * gnu/packages/parallel.scm (slurm)[home-page]: Use HTTPS. --- gnu/packages/parallel.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/parallel.scm') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 2ec866f5f6..6adde3dde9 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -139,7 +139,7 @@ and they are executed on lists of files, hosts, users or other items.") (modify-phases %standard-phases (add-after 'unpack 'autoconf (lambda _ (invoke "autoconf")))))) ; configure.ac was patched - (home-page "http://slurm.schedmd.com/") + (home-page "https://slurm.schedmd.com/") (synopsis "Workload manager for cluster computing") (description "SLURM is a fault-tolerant and highly scalable cluster management and job -- cgit 1.4.1 From 70260b33e055df6d15a3fe94f22e74146e417a1c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 17 Jan 2018 19:24:18 +0100 Subject: gnu: slurm: Add detailed licence information. * gnu/packages/parallel.scm (slurm)[license]: Add more licences. --- gnu/packages/parallel.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'gnu/packages/parallel.scm') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 6adde3dde9..1d2b75f8fe 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -148,7 +148,12 @@ resources (computer nodes) to users for some duration of time, provides a framework for starting, executing, and monitoring work (typically a parallel job) on a set of allocated nodes, and arbitrates contention for resources by managing a queue of pending work.") - (license license:gpl2+))) + (license (list license:bsd-2 ; src/common/log.[ch], src/common/uthash + license:expat ; slurm/pmi.h + license:isc ; src/common/strlcpy.c + license:lgpl2.1+ ; hilbert.[ch], src/common/slurm_time.h + license:zlib ; src/common/strnatcmp.c + license:gpl2+)))) ; the rest, often with OpenSSL exception (define-public slurm-drmaa (package -- cgit 1.4.1 From 1a35f274af16278be769eb72cddea1b14701ab26 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Jan 2018 18:23:00 +0100 Subject: gnu: parallel: Update to 20180122. * gnu/packages/parallel.scm (parallel): Update to 20180122. --- gnu/packages/parallel.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/parallel.scm') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 1d2b75f8fe..d44a422ec2 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -47,7 +47,7 @@ (define-public parallel (package (name "parallel") - (version "20171222") + (version "20180122") (source (origin (method url-fetch) @@ -55,7 +55,7 @@ version ".tar.bz2")) (sha256 (base32 - "1p3r6dlhy49q3y468kf65nqdp0knqw41vwga9rprrvi04kywgj4v")))) + "1wkkqghdjp9j2aqnrfh57kad1w41gdg7knhhlciczkm853f4d0sw")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1 From 28b0b21e3f406cdf3ba9ff32ce80c7108d3d032e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Mon, 22 Jan 2018 18:24:45 +0100 Subject: gnu: parallel: Don't end phase with #. * gnu/packages/parallel.scm (parallel)[arguments]: Use INVOKE. --- gnu/packages/parallel.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gnu/packages/parallel.scm') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index d44a422ec2..337e9d4cb3 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -76,10 +76,10 @@ #t)) (add-after 'install 'post-install-test (lambda* (#:key outputs #:allow-other-keys) - (zero? (system* (string-append - (assoc-ref outputs "out") "/bin/parallel") - "echo" - ":::" "1" "2" "3"))))))) + (invoke (string-append + (assoc-ref outputs "out") "/bin/parallel") + "echo" + ":::" "1" "2" "3")))))) (inputs `(("perl" ,perl) ("procps" ,procps))) -- cgit 1.4.1 From 341afe2a36125b11c1bc08bdc8f63421edaba008 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 23 Jan 2018 01:32:59 +0100 Subject: gnu: parallel: Update source hash. The upstream tarball changed almost immediately after release. See https://lists.gnu.org/archive/html/guix-devel/2018-01/msg00319.html. * gnu/packages/parallel.scm (parallel)[source]: Update hash. --- gnu/packages/parallel.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/parallel.scm') diff --git a/gnu/packages/parallel.scm b/gnu/packages/parallel.scm index 337e9d4cb3..95f0d6227a 100644 --- a/gnu/packages/parallel.scm +++ b/gnu/packages/parallel.scm @@ -55,7 +55,7 @@ version ".tar.bz2")) (sha256 (base32 - "1wkkqghdjp9j2aqnrfh57kad1w41gdg7knhhlciczkm853f4d0sw")))) + "1wkbppb4mc56grl6jsp803sf0hm7mg5ff7qmxalp7sd0vxqw41p9")))) (build-system gnu-build-system) (arguments `(#:phases -- cgit 1.4.1