Merge pull request #1131 from epfl-scitas/fixes/swift_git_environment_variables

fix : swiftsim will set git environment variables in the appropriate hook

var/spack/repos/builtin/packages/swiftsim/package.py

@@ -25,16 +25,8 @@
 
 from spack import *
 
-import spack.environment
 import llnl.util.tty as tty
 
-# Needed to be able to download from the Durham gitlab repository
-tty.warn('Setting "GIT_SSL_NO_VERIFY=1"')
-tty.warn('This is needed to clone SWIFT repository')
-gitlab_env = spack.environment.EnvironmentModifications()
-gitlab_env.set('GIT_SSL_NO_VERIFY', 1)
-gitlab_env.apply_modifications()
-
 
 class Swiftsim(Package):
     """
@@ -46,7 +38,7 @@ class Swiftsim(Package):
     homepage = 'http://icc.dur.ac.uk/swift/'
     url = 'http://gitlab.cosma.dur.ac.uk/swift/swiftsim/repository/archive.tar.gz?ref=v0.3.0'
 
-    version('0.3.0', git='https://gitlab.cosma.dur.ac.uk/swift/swiftsim.git', tag='v0.3.0')
+    version('0.3.0', git='https://gitlab.cosma.dur.ac.uk/swift/swiftsim.git', commit='254cc1b563b2f88ddcf437b1f71da123bb9db733')
 
     variant('mpi', default=True, description='Enable distributed memory parallelism')
 
@@ -61,6 +53,12 @@ class Swiftsim(Package):
     depends_on('hdf5~mpi', when='~mpi')
     depends_on('hdf5+mpi', when='+mpi')
 
+    def setup_environment(self, spack_env, run_env):
+        # Needed to be able to download from the Durham gitlab repository
+        tty.warn('Setting "GIT_SSL_NO_VERIFY=1"')
+        tty.warn('This is needed to clone SWIFT repository')
+        spack_env.set('GIT_SSL_NO_VERIFY', 1)
+
     def install(self, spec, prefix):
         # Generate configure from configure.ac
         # and Makefile.am