Unverified Commit 2ae5aa0b authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #118036 from jluttine/add-jupyter-kernel-env 

nixos/jupyter: add env kernel option
parents 94ac4133 8eafc61e

nixos/modules/services/development/jupyter/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;

nixos/modules/services/development/jupyter/kernel-options.nix

+12 −1
Original line number Diff line number Diff line 
# Options that can be used for creating a jupyter kernel.

{lib }:

{ lib, pkgs }:



with lib;



{

  freeformType = (pkgs.formats.json { }).type;



  options = {



    displayName = mkOption {
@@ -40,6 +42,15 @@ with lib; 
      '';

    };



    env = mkOption {

      type = types.attrsOf types.str;

      default = { };

      example = { OMP_NUM_THREADS = "1"; };

      description = lib.mdDoc ''

        Environment variables to set for the kernel.

      '';

    };



    logo32 = mkOption {

      type = types.nullOr types.path;

      default = null;

nixos/modules/services/development/jupyterhub/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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;