From aead00548f6f852b989253a6f82fe7236cdf7116 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Krup=C4=8D=C3=ADk?= <lukas.krupcik@vsb.cz>
Date: Mon, 20 Jul 2020 09:57:44 +0200
Subject: [PATCH] 	modified:   o/OpenFOAM/OpenFOAM-7-foss-2020a.eb 
 new file:   s/Singularity/Singularity-3.6.0.eb

---
 o/OpenFOAM/OpenFOAM-7-foss-2020a.eb |  2 +-
 s/Singularity/Singularity-3.6.0.eb  | 44 +++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 s/Singularity/Singularity-3.6.0.eb

diff --git a/o/OpenFOAM/OpenFOAM-7-foss-2020a.eb b/o/OpenFOAM/OpenFOAM-7-foss-2020a.eb
index f0afc9f4..f8c2e9ef 100644
--- a/o/OpenFOAM/OpenFOAM-7-foss-2020a.eb
+++ b/o/OpenFOAM/OpenFOAM-7-foss-2020a.eb
@@ -41,7 +41,7 @@ dependencies = [
 
 builddependencies = [
     ('Bison', '3.5.3'),
-    ('CMake', '3.16.4'),
+    ('CMake', '3.13.1', '', True),
     ('flex', '2.6.4'),
 ]
 
diff --git a/s/Singularity/Singularity-3.6.0.eb b/s/Singularity/Singularity-3.6.0.eb
new file mode 100644
index 00000000..5064f4e3
--- /dev/null
+++ b/s/Singularity/Singularity-3.6.0.eb
@@ -0,0 +1,44 @@
+# IT4Innovations 2020
+
+# Dokončeno ručně, nejde bez ROOTa !!!
+
+easyblock = 'ConfigureMake'
+
+name = 'Singularity'
+version = '3.6.0'
+
+homepage = 'https://github.com/sylabs/singularity'
+description = "Singularity is an open source container platform designed to be simple, fast, and secure. Singularity is optimized for EPC and HPC workloads, allowing untrusted users to run untrusted containers in a trusted way."
+
+toolchain = SYSTEM
+
+source_urls = ['https://github.com/sylabs/singularity/releases/download/v%s/' % version]
+sources = ['singularity-%(version)s.tar.gz']
+
+builddependencies = [
+        ('Go', '1.13.5'),
+]
+
+dependencies = [
+        ('squashfs-tools', '4.3'),
+]
+
+osdependencies = [
+    ('openssl-devel', 'libssl-dev', 'libopenssl-devel'),
+]
+
+skipsteps = ['configure']
+prebuildopts = './mconfig --prefix=%(installdir)s && '
+buildopts = '-C ./builddir'
+
+
+postinstallcmds = [
+        'echo "mksquashfs path = /apps/all/squashfs-tools/4.3/bin" >> %(installdir)s/etc/singularity/singularity.conf',
+]
+
+sanity_check_paths = {
+    'files': ['bin/singularity'],
+    'dirs': ['bin', 'etc', 'libexec', 'var'],
+}
+
+moduleclass = 'tools'