From b6c504ab5ad36af2e4e0191fa4ca9fa67e04efa4 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 4 Jan 2025 20:48:19 +0530
Subject: [PATCH] Test jupyter service from Nixpkgs PR

https://github.com/NixOS/nixpkgs/pull/367106
Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 dev-environment/default.nix  |  1 +
 dev-environment/jupyter.nix  |  6 ++++++
 flake.lock                   | 30 +++++++++++++++---------------
 flake.nix                    |  1 +
 modules-overlays/default.nix |  5 +++++
 5 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 dev-environment/jupyter.nix

diff --git a/dev-environment/default.nix b/dev-environment/default.nix
index a3df6156..7b6c3167 100644
--- a/dev-environment/default.nix
+++ b/dev-environment/default.nix
@@ -15,6 +15,7 @@
       # and contains a lot of prebuilt packages
       # configured in home manager
 
+      ./jupyter.nix
       # ./deprecated/c-toolchain.nix
       # ./deprecated/php.nix
     ]
diff --git a/dev-environment/jupyter.nix b/dev-environment/jupyter.nix
new file mode 100644
index 00000000..bb69dcd1
--- /dev/null
+++ b/dev-environment/jupyter.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}:
+{
+  services.jupyter.enable = true;
+  services.jupyter.password = "argon2:$argon2id$v=19$m=10240,t=10,p=8$PxYTOOaulhqndkeAsBaiVQ$cwS31ODwiduBmA59YYTfh2q8SbMBGH93iDjU5tcQ8kU"; # test
+  #services.jupyter.notebookDir = "Notebooks";
+}
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 7e5c45bf..d42b5f42 100644
--- a/flake.lock
+++ b/flake.lock
@@ -419,11 +419,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735947440,
-        "narHash": "sha256-jnEcfmOhWntmVEcqlvs+j532+mvmgsKtQSSfukgkn+A=",
+        "lastModified": 1735979091,
+        "narHash": "sha256-WpFjt6+8UD81EP386c269ZTqpEmlGJgcPw+OB4b7EBs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9987622b7b93c82e147f198574e8e6ffbf5e327",
+        "rev": "11ab08541e61ac3bbf2ab27229f68622629401df",
         "type": "github"
       },
       "original": {
@@ -879,11 +879,11 @@
     },
     "nixpkgs-edge": {
       "locked": {
-        "lastModified": 1735932747,
-        "narHash": "sha256-DW+jJ9aMcB/5MvkRSGKwfTweYpESUu71PoUsQNbk3YM=",
+        "lastModified": 1735975256,
+        "narHash": "sha256-fcZB2X/oScLgqhFKz2E1UNC2yot9jRkaW0ms+G4cbCI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "634ef3757f4d608b10b8c7bb2d1ce8e27c5c7ef2",
+        "rev": "44e31f9528469b1ca3e7216c6f59319bebcd834c",
         "type": "github"
       },
       "original": {
@@ -894,11 +894,11 @@
     },
     "nixpkgs-jupyter-service-fix": {
       "locked": {
-        "lastModified": 1735953229,
-        "narHash": "sha256-QdZRR2GwRJ0OT7icXqa7NuYRdQidAt/LIZmT7eRFMJw=",
+        "lastModified": 1736003680,
+        "narHash": "sha256-3KCFnUPbO7Slsocu6LuH86zhCLndyQKM/O+rXlCsowo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "13dd30e3cf8b2ee7597a9f79d32991d690340a9e",
+        "rev": "5369aaadb5c7f98ae94bb27907595b060420af60",
         "type": "github"
       },
       "original": {
@@ -910,11 +910,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1735960585,
-        "narHash": "sha256-JVpAUYZ/f0HZd5xJmOa3oZA5R8r4K5XNlapMoVOw5hg=",
+        "lastModified": 1736003677,
+        "narHash": "sha256-6JO6eP/GEh0VubWV+tExXNmHs9O23ff4LrAz1KUcUwo=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8cb0cd700b47bb7c6e61fd1946d9dee8d6ad02d8",
+        "rev": "24cdd618a4aa260ec45752bf0e4ede3183f03d74",
         "type": "github"
       },
       "original": {
@@ -1055,11 +1055,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735963831,
-        "narHash": "sha256-Di5ryg6mgQ1SL+SkGCX2GS2fSwhpB5Ed/6Kc5vCL9pA=",
+        "lastModified": 1735998325,
+        "narHash": "sha256-4Zh6FUTQSbAfalbPyrzRTH0GTapf9/qlCEs2OaejFJQ=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "194e6c436e68186fb00db0c085fbf95f53387af1",
+        "rev": "867df4df63ec4f24b79aa6ea97805e2d5efd376a",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 5c5450fd..2e933792 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,7 @@
     nixpkgs.url = "nixpkgs/nixos-unstable"; # Unstable NixOS system (default)
     nixpkgs-edge.url = "nixpkgs/nixos-unstable-small"; # For latest packages
     nixpkgs-master.url = "nixpkgs/master"; # Testing branch of nixpkgs
+    nixpkgs-jupyter-service-fix.url = "github:nixos/nixpkgs/refs/pull/367106/merge";
 
     flake-parts = {
       url = "github:hercules-ci/flake-parts"; # Flake parts for easy flake management
diff --git a/modules-overlays/default.nix b/modules-overlays/default.nix
index 6694b30c..30e3420c 100644
--- a/modules-overlays/default.nix
+++ b/modules-overlays/default.nix
@@ -8,6 +8,11 @@
 }: {
   imports = [
     #./amdgpu.nix # import modules here to test
+    "${inputs.nixpkgs-jupyter-service-fix}/nixos/modules/services/development/jupyter/default.nix"
+  ];
+
+  disabledModules = [
+    "${inputs.nixpkgs}/nixos/modules/services/development/jupyter/default.nix"
   ];
 
   nixpkgs.overlays = [