From 757361ab6e4f23654c8a286ace2f7bbf48f0df6a Mon Sep 17 00:00:00 2001
From: Thomas Ubensee <34603111+tomuben@users.noreply.github.com>
Date: Fri, 20 Sep 2024 03:00:22 -0300
Subject: [PATCH] #958: Fix conda version conflict

---
 ext/scripts/install_scripts/install_via_conda.pl                | 2 +-
 .../flavor_base/build_deps/packages/conda_packages              | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ext/scripts/install_scripts/install_via_conda.pl b/ext/scripts/install_scripts/install_via_conda.pl
index c86000d8..02ad8590 100755
--- a/ext/scripts/install_scripts/install_via_conda.pl
+++ b/ext/scripts/install_scripts/install_via_conda.pl
@@ -148,6 +148,6 @@ sub run_install_command{
 }
 
 
-generate_pinned_file($file, $dry_run, $with_versions, $allow_no_version);
 my $channel_args = generate_channel_args($channel_file);
 run_install_command($file, $dry_run, $with_versions, $allow_no_version, $channel_args);
+generate_pinned_file($file, $dry_run, $with_versions, $allow_no_version);
diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages
index 86b5e9c3..11af791b 100644
--- a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages
+++ b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages
@@ -3,3 +3,5 @@ pcre|8.45
 bazel|7.2.1
 make|4.3
 chrpath|0.16
+gxx_linux-64|12.4.0
+gcc_linux-64|12.4.0
\ No newline at end of file