diff options
| author | Jaakko Luttinen <jaakko.luttinen@iki.fi> | 2022-10-14 20:19:09 +0300 |
|---|---|---|
| committer | Jaakko Luttinen <jaakko.luttinen@iki.fi> | 2022-10-14 22:33:14 +0300 |
| commit | 8eafc61e238d53da35dad025f2925e50d485606d (patch) | |
| tree | c513bf325eac34d9dec90995dc90163b1825a926 /nixos/modules/services/development | |
| parent | 5b520df32f3da8b2df9e7cb055e6115586955534 (diff) | |
| download | nixpkgs-8eafc61e238d53da35dad025f2925e50d485606d.tar nixpkgs-8eafc61e238d53da35dad025f2925e50d485606d.tar.gz nixpkgs-8eafc61e238d53da35dad025f2925e50d485606d.tar.bz2 nixpkgs-8eafc61e238d53da35dad025f2925e50d485606d.tar.lz nixpkgs-8eafc61e238d53da35dad025f2925e50d485606d.tar.xz nixpkgs-8eafc61e238d53da35dad025f2925e50d485606d.tar.zst nixpkgs-8eafc61e238d53da35dad025f2925e50d485606d.zip | |
nixos/jupyter: make kernel options freeform JSON
Diffstat (limited to 'nixos/modules/services/development')
3 files changed, 5 insertions, 3 deletions
diff --git a/nixos/modules/services/development/jupyter/default.nix b/nixos/modules/services/development/jupyter/default.nix index 9b0178d3ea6..c3ef040ebe6 100644 --- a/nixos/modules/services/development/jupyter/default.nix +++ b/nixos/modules/services/development/jupyter/default.nix @@ -119,7 +119,7 @@ in { kernels = mkOption { type = types.nullOr (types.attrsOf(types.submodule (import ./kernel-options.nix { - inherit lib; + inherit lib pkgs; }))); default = null; diff --git a/nixos/modules/services/development/jupyter/kernel-options.nix b/nixos/modules/services/development/jupyter/kernel-options.nix index 3c91d531b0e..6e406152de4 100644 --- a/nixos/modules/services/development/jupyter/kernel-options.nix +++ b/nixos/modules/services/development/jupyter/kernel-options.nix @@ -1,9 +1,11 @@ # Options that can be used for creating a jupyter kernel. -{ lib }: +{ lib, pkgs }: with lib; { + freeformType = (pkgs.formats.json { }).type; + options = { displayName = mkOption { diff --git a/nixos/modules/services/development/jupyterhub/default.nix b/nixos/modules/services/development/jupyterhub/default.nix index c0c0734cac0..cebc35a5047 100644 --- a/nixos/modules/services/development/jupyterhub/default.nix +++ b/nixos/modules/services/development/jupyterhub/default.nix @@ -119,7 +119,7 @@ in { kernels = mkOption { type = types.nullOr (types.attrsOf(types.submodule (import ../jupyter/kernel-options.nix { - inherit lib; + inherit lib pkgs; }))); default = null; |