git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #168473 from erictapen/nbclient
commit50609942614bc996e3d13771fa1513c54338ec94 authorSandro <sandro.jaeckel@gmail.com> dateThu 5 May 2022, 00:37 (5 years ago) parent6c4bc08e02a0ba
4 files changed+14−11
compare with master
unifiedsplit
pkgs/applications/networking/zerobin/default.nix+1−1 pkgs/development/python-modules/bleach/default.nix+2−2 pkgs/development/python-modules/nbclient/default.nix+4−2 pkgs/development/python-modules/nbconvert/default.nix+7−6
pkgs/applications/networking/zerobin/default.nix+1−1
@@ -40,7 +40,7 @@ python3Packages.buildPythonApplication rec {
4040 # relax version constraints of some dependencies
4141 substituteInPlace setup.cfg \
4242 --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" \
4444 --replace "bottle==0.12.18" "bottle>=0.12.18,<1" \
4545 --replace "Paste==3.4.3" "Paste>=3.4.3,<4"
4646 '';
pkgs/development/python-modules/bleach/default.nix+2−2
@@ -11,12 +11,12 @@
1111
1212buildPythonPackage rec {
1313 pname = "bleach";
14− version = "4.1.0";
14+ version = "5.0.0";
1515 disabled = pythonOlder "3.6";
1616
1717 src = fetchPypi {
1818 inherit pname version;
19− sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo=";
19+ hash = "sha256-xtbMBUvcnIO0i4CD4jbl8A8jhChmbSzi4IPqpf1WhWU=";
2020 };
2121
2222 propagatedBuildInputs = [
pkgs/development/python-modules/nbclient/default.nix+4−2
@@ -5,12 +5,14 @@
55
66buildPythonPackage rec {
77 pname = "nbclient";
8− version = "0.5.13";
8+ version = "0.6.2";
9+ format = "setuptools";
10+
911 disabled = pythonOlder "3.7";
1012
1113 src = fetchPypi {
1214 inherit pname version;
13− sha256 = "sha256-QMUsm148MfrsruafICs/U+ONfBxWPeD63enX7aD9r+g=";
15+ hash = "sha256-i0dVPxztB3zXxFN/1dcB1G92gfJLKCdeXMHTR+fJtGs=";
1416 };
1517
1618 doCheck = false; # Avoid infinite recursion
pkgs/development/python-modules/nbconvert/default.nix+7−6
@@ -5,13 +5,11 @@
55, glibcLocales
66, entrypoints
77, bleach
8−, beautifulsoup4
98, mistune
109, nbclient
1110, jinja2
1211, pygments
1312, traitlets
14−, testpath
1513, jupyter_core
1614, jupyterlab-pygments
1715, nbformat
@@ -20,15 +18,18 @@
2018, tornado
2119, jupyter-client
2220, defusedxml
21+, tinycss2
22+, beautifulsoup4
2323}:
2424
2525buildPythonPackage rec {
2626 pname = "nbconvert";
27− version = "6.4.5";
27+ version = "6.5.0";
28+ format = "setuptools";
2829
2930 src = fetchPypi {
3031 inherit pname version;
31− sha256 = "sha256-IRY6jiBzwHEJyo85iDbkXv26KqzqaNb3WopUX+8HDU4=";
32+ hash = "sha256-Ij5G4nq+hZa4rtVDAfrbukM7f/6oGWpo/Xsf9Qnu6Z0=";
3233 };
3334
3435 # Add $out/share/jupyter to the list of paths that are used to search for
@@ -44,9 +45,9 @@ buildPythonPackage rec {
4445 checkInputs = [ pytestCheckHook glibcLocales ];
4546
4647 propagatedBuildInputs = [
47− entrypoints bleach mistune jinja2 pygments traitlets testpath
48+ entrypoints bleach mistune jinja2 pygments traitlets
4849 jupyter_core nbformat ipykernel pandocfilters tornado jupyter-client
49− defusedxml beautifulsoup4
50+ defusedxml tinycss2 beautifulsoup4
5051 nbclient
5152 jupyterlab-pygments
5253 ];