Merge branch 'main' of github.com:codedownio/codedown-languages

codedownio · Dec 12, 2024 · 8f4caf1 · 8f4caf1
2 parents 504833d + 6440e57
commit 8f4caf1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/modules/shells/zsh/default.nix b/modules/shells/zsh/default.nix
@@ -9,6 +9,10 @@
 let
   extraPaths = lib.optionals (!stdenv.targetPlatform.isDarwin) [glibc.bin];
 
+  pathPrefixArg = if extraPaths == []
+                  then ""
+                  else "--prefix PATH : ${lib.makeBinPath extraPaths}";
+
 in
 
 stdenv.mkDerivation {
@@ -36,8 +40,7 @@ stdenv.mkDerivation {
     # Source the user's .zshrc if present
     echo "[ -f ~/.zshrc ] && source ~/.zshrc" >> .zshrc
 
-    makeWrapper ${zsh}/bin/zsh $out/bin/zsh-with-theme \
-      --prefix PATH : ${lib.makeBinPath extraPaths}
+    makeWrapper ${zsh}/bin/zsh $out/bin/zsh-with-theme ${pathPrefixArg} \
       --set ZDOTDIR $out
   '';
 

diff --git a/sample_environments/mega.nix b/sample_environments/mega.nix
@@ -29,7 +29,7 @@ codedown.makeEnvironment {
   kernels.haskell.lsp.haskell-language-server.debug = true;
 
   kernels.octave.enable = true;
-  kernels.octave.packages = ["arduino"];
+  kernels.octave.packages = ["doctest"];
   kernels.octave.extraJupyterConfig = ''
     c.OctaveKernel.plot_settings = dict(format='svg')
   '';