From 873e3a86247b4283a77e2227b8ee16867ce795b2 Mon Sep 17 00:00:00 2001
From: Theofilos Manitaras <manitaras@cscs.ch>
Date: Mon, 28 Jun 2021 11:47:38 +0200
Subject: [PATCH 1/2] Remove PrgEnv-nvidia from eiger/pilatus config

---
 config/cscs.py | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/config/cscs.py b/config/cscs.py
index 16bf30e7d9..3dcbe8114f 100644
--- a/config/cscs.py
+++ b/config/cscs.py
@@ -684,7 +684,6 @@
                         'PrgEnv-cray',
                         'PrgEnv-gnu',
                         'PrgEnv-intel',
-                        'PrgEnv-nvidia',
                         'cpeAMD',
                         'cpeCray',
                         'cpeGNU',
@@ -704,7 +703,6 @@
                         'PrgEnv-cray',
                         'PrgEnv-gnu',
                         'PrgEnv-intel',
-                        'PrgEnv-nvidia',
                         'cpeAMD',
                         'cpeCray',
                         'cpeGNU',
@@ -747,7 +745,6 @@
                         'PrgEnv-cray',
                         'PrgEnv-gnu',
                         'PrgEnv-intel',
-                        'PrgEnv-nvidia',
                         'cpeAMD',
                         'cpeCray',
                         'cpeGNU',
@@ -767,7 +764,6 @@
                         'PrgEnv-cray',
                         'PrgEnv-gnu',
                         'PrgEnv-intel',
-                        'PrgEnv-nvidia',
                         'cpeAMD',
                         'cpeCray',
                         'cpeGNU',
@@ -1081,17 +1077,6 @@
                 'PrgEnv-pgi'
             ]
         },
-        {
-            'name': 'PrgEnv-nvidia',
-            'target_systems': [
-                'pilatus', 'eiger'
-            ],
-            'modules': [
-                'PrgEnv-nvidia',
-                # FIXME: We should not be forcing a cdt version
-                'cpe/21.06'
-            ]
-        },
         {
             'name': 'PrgEnv-nvidia',
             'target_systems': [

From 5451baf49a8e30d9ed3076bd8687e9e5e907542e Mon Sep 17 00:00:00 2001
From: Theofilos Manitaras <manitaras@cscs.ch>
Date: Mon, 28 Jun 2021 12:24:52 +0200
Subject: [PATCH 2/2] Revert deletion of PrgEnv-nvidia from pilatus

---
 config/cscs.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/config/cscs.py b/config/cscs.py
index 3dcbe8114f..6fbb52e6ec 100644
--- a/config/cscs.py
+++ b/config/cscs.py
@@ -745,6 +745,7 @@
                         'PrgEnv-cray',
                         'PrgEnv-gnu',
                         'PrgEnv-intel',
+                        'PrgEnv-nvidia',
                         'cpeAMD',
                         'cpeCray',
                         'cpeGNU',
@@ -764,6 +765,7 @@
                         'PrgEnv-cray',
                         'PrgEnv-gnu',
                         'PrgEnv-intel',
+                        'PrgEnv-nvidia',
                         'cpeAMD',
                         'cpeCray',
                         'cpeGNU',
@@ -1077,6 +1079,17 @@
                 'PrgEnv-pgi'
             ]
         },
+        {
+            'name': 'PrgEnv-nvidia',
+            'target_systems': [
+                'pilatus'
+            ],
+            'modules': [
+                'PrgEnv-nvidia',
+                # FIXME: We should not be forcing a cdt version
+                'cpe/21.06'
+            ]
+        },
         {
             'name': 'PrgEnv-nvidia',
             'target_systems': [