Merge branch 'develop' into feat/export-annotation-2

edrlab · Jan 29, 2025 · a1de16a · a1de16a
2 parents 8271ae4 + 6398630
commit a1de16a
Show file tree

Hide file tree

Showing 45 changed files with 8,464 additions and 8,048 deletions.
diff --git a/.flox/env/manifest.lock b/.flox/env/manifest.lock
diff --git a/.flox/env/manifest.toml b/.flox/env/manifest.toml
@@ -126,7 +126,7 @@ unset FLOX_CACHE_DIR
 export NODE_PATH="$NPM_CONFIG_PREFIX/lib/node_modules${NODE_PATH:+:$NODE_PATH}";
 [[ ! -z "${FLX_VERBOSE}" ]] && echo "-----> NODE_PATH: ${NODE_PATH}";
 
-export PATH="$NPM_CONFIG_PREFIX/bin:$PATH";
+# export PATH="$NPM_CONFIG_PREFIX/bin:$PATH";
 
 npm install -g npm --foreground-scripts 1>/dev/null
 npm install -g npm-check-updates --foreground-scripts 1>/dev/null
@@ -138,6 +138,8 @@ common = '''
 [[ ! -z "${FLX_VERBOSE}" ]] && echo "##################################################";
 [[ ! -z "${FLX_VERBOSE}" ]] && echo "########## FLOX PROFILE COMMON (${SHELL})...";
 
+export PATH="$NPM_CONFIG_PREFIX/bin:$PATH";
+
 alias lss='ls -alshF --color=auto'
 alias flx='flox activate'
 alias flxx='FLOX_VERBOSE=1 flox activate'