From d14c11f044b51e49f0907e695396271d572c2373 Mon Sep 17 00:00:00 2001
From: David Crompton <david.crompton@mail.utoronto.ca>
Date: Fri, 10 May 2024 13:53:29 -0400
Subject: [PATCH] Python: MNE-Fix

---
 flake.nix                              | 3 ++-
 machines/kcnhub/servers/jupyterhub.nix | 2 +-
 overlays/python-packages.nix           | 9 +++++++++
 overlays/python.nix                    | 5 +++++
 4 files changed, 17 insertions(+), 2 deletions(-)
 create mode 100644 overlays/python-packages.nix
 create mode 100644 overlays/python.nix

diff --git a/flake.nix b/flake.nix
index f5d90e1..43b0c99 100644
--- a/flake.nix
+++ b/flake.nix
@@ -35,6 +35,7 @@
         config.cudaSupport = true;
       };
     };
+    python-overlay = import ./overlays/python.nix;
     applyOverlays = overlays: ({...}:{ nixpkgs.overlays = overlays; });
     flakes = {...}: {nix.settings.experimental-features = [ "nix-command" "flakes" ];};
   in {
@@ -43,7 +44,7 @@
       specialArgs = attrs;
       modules = [ 
          flakes
-         (applyOverlays [ unfree-overlay unstable-overlay ])
+         (applyOverlays [ unfree-overlay unstable-overlay python-overlay ])
          ./machines/kcnhub/configuration.nix
          sops-nix.nixosModules.sops
       ];
diff --git a/machines/kcnhub/servers/jupyterhub.nix b/machines/kcnhub/servers/jupyterhub.nix
index 19b23b8..892d177 100644
--- a/machines/kcnhub/servers/jupyterhub.nix
+++ b/machines/kcnhub/servers/jupyterhub.nix
@@ -200,7 +200,7 @@
 
           # Neural Data Processing Libraries
           # Temporarily broken?: https://github.com/NixOS/nixpkgs/issues/259812
-          # mne-python
+          mne-python
           nibabel
           # View niftis!
           ipyniivue
diff --git a/overlays/python-packages.nix b/overlays/python-packages.nix
new file mode 100644
index 0000000..3218c59
--- /dev/null
+++ b/overlays/python-packages.nix
@@ -0,0 +1,9 @@
+final-py: prev-py: {
+  mne-python = prev-py.mne-python.overridePythonAttrs (old: {
+    pyproject = true;
+    format = null;
+    propagatedBuildInputs = old.propagatedBuildInputs ++ [
+      final-py.setuptools-scm
+    ];
+  });
+}
diff --git a/overlays/python.nix b/overlays/python.nix
new file mode 100644
index 0000000..f5208fe
--- /dev/null
+++ b/overlays/python.nix
@@ -0,0 +1,5 @@
+final: prev: {
+  pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [(
+    (import ./python-packages.nix)
+  )];
+}