git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #168473 from erictapen/nbclient
5060994Sandro
pkgs/applications/networking/zerobin/default.nix+1−1
compare with master
unifiedsplit
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
40 # relax version constraints of some dependencies
40 # relax version constraints of some dependencies
41 substituteInPlace setup.cfg \
41 substituteInPlace setup.cfg \
42 --replace "clize==4.1.1" "clize" \
42 --replace "clize==4.1.1" "clize" \
43− --replace "bleach==3.1.5" "bleach>=3.1.5,<5" \
43+ --replace "bleach==3.1.5" "bleach>=3.1.5,<6" \
44 --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \
44 --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \
45 --replace "Paste==3.4.3" "Paste>=3.4.3,<4"
45 --replace "Paste==3.4.3" "Paste>=3.4.3,<4"
46 '';
46 '';
pkgs/development/python-modules/bleach/default.nix+2−2
@@ -11,12 +11,12 @@
11
11
12buildPythonPackage rec {
12buildPythonPackage rec {
13 pname = "bleach";
13 pname = "bleach";
14− version = "4.1.0";
14+ version = "5.0.0";
15 disabled = pythonOlder "3.6";
15 disabled = pythonOlder "3.6";
16
16
17 src = fetchPypi {
17 src = fetchPypi {
18 inherit pname version;
18 inherit pname version;
19− sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";
19+ hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU=";
20 };
20 };
21
21
22 propagatedBuildInputs = [
22 propagatedBuildInputs = [
pkgs/development/python-modules/nbclient/default.nix+4−2
@@ -5,12 +5,14 @@
5
5
6buildPythonPackage rec {
6buildPythonPackage rec {
7 pname = "nbclient";
7 pname = "nbclient";
8− version = "0.5.13";
8+ version = "0.6.2";
9+ format = "setuptools";
10+
9 disabled = pythonOlder "3.7";
11 disabled = pythonOlder "3.7";
10
12
11 src = fetchPypi {
13 src = fetchPypi {
12 inherit pname version;
14 inherit pname version;
13− sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g=";
15+ hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs=";
14 };
16 };
15
17
16 doCheck = false; # Avoid infinite recursion
18 doCheck = false; # Avoid infinite recursion
pkgs/development/python-modules/nbconvert/default.nix+7−6
@@ -5,13 +5,11 @@
5, glibcLocales
5, glibcLocales
6, entrypoints
6, entrypoints
7, bleach
7, bleach
8−, beautifulsoup4
9, mistune
8, mistune
10, nbclient
9, nbclient
11, jinja2
10, jinja2
12, pygments
11, pygments
13, traitlets
12, traitlets
14−, testpath
15, jupyter_core
13, jupyter_core
16, jupyterlab-pygments
14, jupyterlab-pygments
17, nbformat
15, nbformat
@@ -20,15 +18,18 @@
20, tornado
18, tornado
21, jupyter-client
19, jupyter-client
22, defusedxml
20, defusedxml
21+, tinycss2
22+, beautifulsoup4
23}:
23}:
24
24
25buildPythonPackage rec {
25buildPythonPackage rec {
26 pname = "nbconvert";
26 pname = "nbconvert";
27− version = "6.4.5";
27+ version = "6.5.0";
28+ format = "setuptools";
28
29
29 src = fetchPypi {
30 src = fetchPypi {
30 inherit pname version;
31 inherit pname version;
31− sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4=";
32+ hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0=";
32 };
33 };
33
34
34 # Add $out/share/jupyter to the list of paths that are used to search for
35 # Add $out/share/jupyter to the list of paths that are used to search for
@@ -44,9 +45,9 @@ buildPythonPackage rec {
44 checkInputs = [ pytestCheckHook glibcLocales ];
45 checkInputs = [ pytestCheckHook glibcLocales ];
45
46
46 propagatedBuildInputs = [
47 propagatedBuildInputs = [
47− entrypoints bleach mistune jinja2 pygments traitlets testpath
48+ entrypoints bleach mistune jinja2 pygments traitlets
48 jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client
49 jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client
49− defusedxml beautifulsoup4
50+ defusedxml tinycss2 beautifulsoup4
50 nbclient
51 nbclient
51 jupyterlab-pygments
52 jupyterlab-pygments
52 ];
53 ];