aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock17
-rw-r--r--flake.nix9
-rw-r--r--tasks/default.nix7
3 files changed, 26 insertions, 7 deletions
diff --git a/flake.lock b/flake.lock
index bfd9fd9..64b9a32 100644
--- a/flake.lock
+++ b/flake.lock
@@ -37,6 +37,22 @@
"type": "github"
}
},
+ "jupyter": {
+ "flake": false,
+ "locked": {
+ "lastModified": 1627572257,
+ "narHash": "sha256-0zNm9EM7xJbYfaWylPvwApo1MM65eJiFkVlZRwJzGgY=",
+ "owner": "tweag",
+ "repo": "jupyterWith",
+ "rev": "37cd8caefd951eaee65d9142544aa4bd9dfac54f",
+ "type": "github"
+ },
+ "original": {
+ "owner": "tweag",
+ "repo": "jupyterWith",
+ "type": "github"
+ }
+ },
"nixpkgs": {
"locked": {
"lastModified": 1629139728,
@@ -85,6 +101,7 @@
"inputs": {
"emacs": "emacs",
"home-manager": "home-manager",
+ "jupyter": "jupyter",
"nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable",
"personal": "personal"
diff --git a/flake.nix b/flake.nix
index 1581269..9569468 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,9 +13,15 @@
url = https://pkgs.kummerlaender.eu/nixexprs.tar.xz;
flake = false;
};
+ jupyter = {
+ url = github:tweag/jupyterWith;
+ flake = false;
+ };
};
- outputs = { self, nixpkgs, nixpkgs-unstable, emacs, home-manager, personal, ... }: let
+ outputs = {
+ self, nixpkgs, nixpkgs-unstable, emacs, home-manager, personal, jupyter, ...
+ }: let
system = "x86_64-linux";
pkgs = import nixpkgs {
@@ -32,6 +38,7 @@
config = { allowUnfree = true; };
overlays = [ emacs.overlay ];
};
+ jupyter = import jupyter { };
};
imports = [ ./home.nix ];
nixpkgs = {
diff --git a/tasks/default.nix b/tasks/default.nix
index d1c7bc9..075af56 100644
--- a/tasks/default.nix
+++ b/tasks/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, jupyter, ... }:
let
mkShellDerivation = n: ps: pkgs.stdenvNoCC.mkDerivation rec {
@@ -27,11 +27,6 @@ let
'';
};
- jupyter = import (builtins.fetchGit {
- url = https://github.com/tweag/jupyterWith;
- rev = "35eb565c6d00f3c61ef5e74e7e41870cfa3926f7";
- }) {};
-
mkJupyterEnv = kernel: jupyter.jupyterlabWith {
kernels = [ kernel ];
};