diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-04-09 18:28:16 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-04-12 18:46:15 +0000 |
| commit | fd2e737e0678ee7d8081baef05b305146a2c0034 (patch) | |
| tree | ac3e9b27576a0382335532d126f9a66d486bc638 /nixpkgs/pkgs/development/python-modules/nbconvert | |
| parent | cc207d720b6aa836e256c1ee9842bc739e630a8a (diff) | |
| parent | 9e377a6ce42dccd9b624ae4ce8f978dc892ba0e2 (diff) | |
| download | nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.gz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.bz2 nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.lz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.xz nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.tar.zst nixlib-fd2e737e0678ee7d8081baef05b305146a2c0034.zip | |
Merge remote-tracking branch 'nixpkgs/nixos-unstable'
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/nbconvert')
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/nbconvert/default.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/python-modules/nbconvert/templates.patch | 12 |
2 files changed, 22 insertions, 0 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix index 582a6132c259..02eda2beb195 100644 --- a/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix +++ b/nixpkgs/pkgs/development/python-modules/nbconvert/default.nix @@ -30,6 +30,16 @@ buildPythonPackage rec { sha256 = "cbbc13a86dfbd4d1b5dee106539de0795b4db156c894c2c5dc382062bbc29002"; }; + # Add $out/share/jupyter to the list of paths that are used to search for + # various exporter templates + patches = [ + ./templates.patch + ]; + + postPatch = '' + substituteAllInPlace ./nbconvert/exporters/templateexporter.py + ''; + checkInputs = [ pytestCheckHook glibcLocales ]; propagatedBuildInputs = [ diff --git a/nixpkgs/pkgs/development/python-modules/nbconvert/templates.patch b/nixpkgs/pkgs/development/python-modules/nbconvert/templates.patch new file mode 100644 index 000000000000..cadaf69a7b84 --- /dev/null +++ b/nixpkgs/pkgs/development/python-modules/nbconvert/templates.patch @@ -0,0 +1,12 @@ +diff --git a/nbconvert/exporters/templateexporter.py b/nbconvert/exporters/templateexporter.py +index 0d540eb1..440f6382 100644 +--- a/nbconvert/exporters/templateexporter.py ++++ b/nbconvert/exporters/templateexporter.py +@@ -616,6 +616,7 @@ class TemplateExporter(Exporter): + if DEV_MODE: + root_dirs.append(os.path.abspath(os.path.join(ROOT, '..', '..', 'share', 'jupyter'))) + root_dirs.extend(jupyter_path()) ++ root_dirs.append(os.path.join("@out@", "share", "jupyter")) + return root_dirs + + def _init_resources(self, resources): |