From 29fc693c73c1362e0742a7bf9188e3a079006ad1 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Wed, 27 Nov 2024 03:27:23 -0800 Subject: [PATCH 1/3] tests/flake.nix: add darwin outputs --- tests/flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/flake.nix b/tests/flake.nix index 0a3f270..6e73025 100644 --- 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 {}; From 2abfe1443997ba332ad51c52d3baf52039678829 Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Wed, 27 Nov 2024 03:27:32 -0800 Subject: [PATCH 2/3] darwin: don't use bwrap in JupyterRunnerContext.hs --- tests/src/TestLib/JupyterRunnerContext.hs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/src/TestLib/JupyterRunnerContext.hs b/tests/src/TestLib/JupyterRunnerContext.hs index 273cc79..51b93be 100644 --- 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 From 285697f7e9726083b629e4fdc2b51d7bc5cb21ad Mon Sep 17 00:00:00 2001 From: Tom McLaughlin Date: Wed, 27 Nov 2024 03:27:42 -0800 Subject: [PATCH 3/3] julia/default.nix: remove unused outputs --- modules/kernels/julia/default.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/modules/kernels/julia/default.nix b/modules/kernels/julia/default.nix index eeed018..483b7b1 100644 --- a/modules/kernels/julia/default.nix +++ b/modules/kernels/julia/default.nix @@ -2,9 +2,6 @@ , python3 , callPackage , fetchFromGitHub -, writeTextDir -, stdenv -, runCommand , symlinkJoin , julia