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

codedownio · Nov 29, 2024 · 588a63f · 588a63f
2 parents 3cbda55 + 285697f
commit 588a63f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/modules/kernels/julia/default.nix b/modules/kernels/julia/default.nix
@@ -2,9 +2,6 @@
 , python3
 , callPackage
 , fetchFromGitHub
-, writeTextDir
-, stdenv
-, runCommand
 , symlinkJoin
 
 , julia

diff --git a/tests/flake.nix b/tests/flake.nix
@@ -5,7 +5,7 @@
 
   outputs = { self, nixpkgs, flake-utils }@inputs:
     # flake-utils.lib.eachDefaultSystem (system:
-    flake-utils.lib.eachSystem ["x86_64-linux"] (system:
+    flake-utils.lib.eachSystem ["x86_64-linux" "x86_64-darwin" "aarch64-darwin"] (system:
       let
         pkgs = import nixpkgs { inherit system; };
         tests = pkgs.haskell.packages.ghc965.callPackage ./tests.nix {};

diff --git a/tests/src/TestLib/JupyterRunnerContext.hs b/tests/src/TestLib/JupyterRunnerContext.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
+{-# LANGUAGE CPP #-}
 {-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE RankNTypes #-}
 
@@ -56,9 +57,13 @@ introduceJustBubblewrap :: (
   HasBaseContext context, MonadIO m, MonadMask m, MonadUnliftIO m, MonadBaseControl IO m
   ) => SpecFree (LabelValue "maybeBubblewrap" (Maybe FilePath) :> context) m () -> SpecFree context m ()
 introduceJustBubblewrap = introduceWith [i|bwrap|] maybeBubblewrap $ \action -> do
+#ifdef darwin_HOST_OS
+  void $ action Nothing
+#else
   liftIO (findExecutable "bwrap") >>= \case
     Nothing -> expectationFailure [i|The tests currently require bubblewrap to be present.|]
     Just path -> void $ action (Just path)
+#endif
 
 introduceNothingBubblewrap :: (
   HasBaseContext context, MonadIO m, MonadMask m, MonadUnliftIO m, MonadBaseControl IO m