From 5c51d0f03c6f16be713f6562b164d350b58cc130 Mon Sep 17 00:00:00 2001
From: Martijn Visser <mgvisser@gmail.com>
Date: Mon, 8 Jul 2024 14:16:17 +0200
Subject: [PATCH 1/2] Stop using local JULIAUP_DEPOT_PATH

---
 .gitignore          | 2 --
 pixi.toml           | 8 +-------
 utils/env_setup.bat | 1 -
 utils/env_setup.sh  | 3 ---
 4 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 utils/env_setup.bat
 delete mode 100644 utils/env_setup.sh

diff --git a/.gitignore b/.gitignore
index 7312d368f..604242d59 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,5 +27,3 @@
 
 # pixi environments
 .pixi
-# juliaup
-utils/juliaup
diff --git a/pixi.toml b/pixi.toml
index 134454d18..f582213e0 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -10,7 +10,7 @@ platforms = ["win-64", "linux-64"]
 
 [tasks]
 # Installation
-install-julia = "juliaup add 1.10.0 && juliaup default 1.10.0"
+install-julia = "juliaup add 1.10.0 && juliaup override set 1.10.0"
 # Julia
 update-registry-julia = "julia --eval='using Pkg; Registry.update()'"
 instantiate-julia = "julia --project --eval='using Pkg; Pkg.instantiate()'"
@@ -46,11 +46,5 @@ instantiate-wflow-server = "julia --project=server --eval 'using Pkg; Pkg.instan
 juliaup = "*"
 python = ">=3.10"
 
-[activation]
-scripts = ["utils/env_setup.sh"]
-
-[target.win-64.activation]
-scripts = ["utils/env_setup.bat"]
-
 [system-requirements]
 linux = "3.10.0"
diff --git a/utils/env_setup.bat b/utils/env_setup.bat
deleted file mode 100644
index f60008e9e..000000000
--- a/utils/env_setup.bat
+++ /dev/null
@@ -1 +0,0 @@
-set JULIAUP_DEPOT_PATH=%~dp0
diff --git a/utils/env_setup.sh b/utils/env_setup.sh
deleted file mode 100644
index 15e083050..000000000
--- a/utils/env_setup.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-JULIAUP_DEPOT_PATH=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-export JULIAUP_DEPOT_PATH

From a9372f3628ec292df5ea190bef9f64d992133b25 Mon Sep 17 00:00:00 2001
From: Martijn Visser <mgvisser@gmail.com>
Date: Tue, 9 Jul 2024 14:31:03 +0200
Subject: [PATCH 2/2] Avoid error when override is already set

---
 pixi.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pixi.toml b/pixi.toml
index f582213e0..824ed2000 100644
--- a/pixi.toml
+++ b/pixi.toml
@@ -10,7 +10,7 @@ platforms = ["win-64", "linux-64"]
 
 [tasks]
 # Installation
-install-julia = "juliaup add 1.10.0 && juliaup override set 1.10.0"
+install-julia = "juliaup add 1.10.0 && juliaup override unset && juliaup override set 1.10.0"
 # Julia
 update-registry-julia = "julia --eval='using Pkg; Registry.update()'"
 instantiate-julia = "julia --project --eval='using Pkg; Pkg.instantiate()'"