From eb2e035ba9aec3bf48136352f11e285ecb2a0a2a Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Tue, 23 Apr 2024 16:29:37 +0100
Subject: [PATCH] Make mkIpythonKernel and mkJupyterShell proper functions

---
 flake.nix     | 4 ++--
 ipykernel.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6d29e9f..a447026 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,8 +18,8 @@
     packages.${system} = {
       poetry2nix = poetry2nix.lib.mkPoetry2Nix {inherit pkgs;};
       catppuccin_jupyterlab = import ./catppuccin_jupyterlab/default.nix;
-      mkIpythonKernel = import ./ipykernel.nix;
-      mkJupyterShell = import ./jupyter.nix;
+      mkIpythonKernel = attrs: (pkgs.callPackage ./ipykernel.nix attrs);
+      mkJupyterShell = attrs: (pkgs.callPackage ./jupyter.nix attrs);
       default = self.packages.${system}.mkJupyterShell;
     };
   };
diff --git a/ipykernel.nix b/ipykernel.nix
index 7c9b87d..d6643a0 100644
--- a/ipykernel.nix
+++ b/ipykernel.nix
@@ -1,12 +1,12 @@
 {
-  pkgs,
+  writeTextFile,
   name,
   pyenv,
   ...
 }: let
   interpreter = pyenv.interpreter; # TODO ensure ipykernel package installed somehow...
 in
-  pkgs.writeTextFile {
+  writeTextFile {
     name = "${name}-ipykernel";
     destination = "/kernels/${name}/kernel.json";
     text = builtins.toJSON {