From 53eb24af9b4c084989ed5ba6f03b5bb81972e6d1 Mon Sep 17 00:00:00 2001 From: Bernhard Kaindl <43588962+bernhardkaindl@users.noreply.github.com> Date: Fri, 3 Dec 2021 19:23:08 +0100 Subject: singularity, singularityce: Add 3.8.5 and ce-3.9.1 (#27778) --- var/spack/repos/builtin/packages/singularity/package.py | 3 ++- var/spack/repos/builtin/packages/singularityce/package.py | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'var') diff --git a/var/spack/repos/builtin/packages/singularity/package.py b/var/spack/repos/builtin/packages/singularity/package.py index a53605b968..15ca4ec3f7 100644 --- a/var/spack/repos/builtin/packages/singularity/package.py +++ b/var/spack/repos/builtin/packages/singularity/package.py @@ -21,11 +21,12 @@ class Singularity(SingularityBase): ''' homepage = "https://singularity.hpcng.org/" git = "https://github.com/hpcng/singularity.git" - url = "https://github.com/hpcng/singularity/releases/download/v3.8.3/singularity-3.8.3.tar.gz" + url = "https://github.com/hpcng/singularity/releases/download/v3.8.5/singularity-3.8.5.tar.gz" maintainers = ['alalazo'] version('master', branch='master') + version('3.8.5', sha256='7fff78b5c07b5d4d08269bd267ac5e994390f933321e54efd6b7c86683153ce4') version('3.8.3', sha256='2e22eb9ee1b73fdd51b8783149f0e4d83c0d2d8a0c1edf6034157d50eeefb835') version('3.8.0', sha256='e9608b0e0a8c805218bbe795e9176484837b2f7fcb95e5469b853b3809a2412e') version('3.7.4', sha256='c266369a8bf2747f44e0759858c3fc3b2325b975a8818b2668f0b97b124d0164') diff --git a/var/spack/repos/builtin/packages/singularityce/package.py b/var/spack/repos/builtin/packages/singularityce/package.py index 8b4fea32ff..750e15dbd5 100644 --- a/var/spack/repos/builtin/packages/singularityce/package.py +++ b/var/spack/repos/builtin/packages/singularityce/package.py @@ -16,7 +16,7 @@ class SingularityBase(MakefilePackage): variant('network', default=True, description='install network plugins') depends_on('pkgconfig', type='build') - depends_on('go') + depends_on('go@1.16:') depends_on('uuid') depends_on('libgpg-error') depends_on('libseccomp') @@ -25,6 +25,8 @@ class SingularityBase(MakefilePackage): depends_on('shadow', type='run', when='@3.3:') depends_on('cryptsetup', type=('build', 'run'), when='@3.4:') + conflicts('platform=darwin', msg='singularity requires a Linux VM on Windows & Mac') + # Go has novel ideas about how projects should be organized. # We'll point GOPATH at the stage dir, and move the unpacked src # tree into the proper subdir in our overridden do_stage below. @@ -160,10 +162,11 @@ class Singularityce(SingularityBase): ''' homepage = "https://sylabs.io/singularity/" - url = "https://github.com/sylabs/singularity/releases/download/v3.8.0/singularity-ce-3.8.0.tar.gz" + url = "https://github.com/sylabs/singularity/releases/download/v3.9.1/singularity-ce-3.9.1.tar.gz" git = "https://github.com/sylabs/singularity.git" maintainers = ['alalazo'] version('master', branch='master') + version('3.9.1', sha256='1ba3bb1719a420f48e9b0a6afdb5011f6c786d0f107ef272528c632fff9fd153') version('3.8.0', sha256='5fa2c0e7ef2b814d8aa170826b833f91e5031a85d85cd1292a234e6c55da1be1') -- cgit v1.2.3-70-g09d2