#958: Fix conda version conflict

exasol · Nov 12, 2024 · 02700c9 · 02700c9
1 parent dfcc165
commit 02700c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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/...template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_deps/packages/conda_packages b/...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