Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 39a8f717b879
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 53feebb37937
Choose a head ref
  • 1 commit
  • 2 files changed
  • 1 contributor

Commits on Oct 30, 2019

  1. nbdime: init at 1.0.6

    tbenst authored and Jon committed Oct 30, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    makefu Felix Richter
    Copy the full SHA
    53feebb View commit details
Showing with 71 additions and 0 deletions.
  1. +69 −0 pkgs/development/python-modules/nbdime/default.nix
  2. +2 −0 pkgs/top-level/python-packages.nix
69 changes: 69 additions & 0 deletions pkgs/development/python-modules/nbdime/default.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
{ lib, buildPythonPackage, fetchPypi, callPackage, isPy3k
, hypothesis
, setuptools_scm
, six
, attrs
, py
, setuptools
, pytestcov
, pytest-timeout
, pytest-tornado
, mock
, tabulate
, nbformat
, jsonschema
, pytest
, colorama
, pygments
, tornado
, requests
, GitPython
, notebook
, jinja2
}:

buildPythonPackage rec {
pname = "nbdime";
version = "1.0.6";
disabled = !isPy3k;

src = fetchPypi {
inherit pname version;
sha256 = "00nywb69kp9i0wl5mczgwqc5db8v70ihr9cjbwqppd2jkx4vf34j";
};

checkInputs = [
hypothesis
pytestcov
pytest-timeout
pytest-tornado
jsonschema
mock
tabulate
pytest
];

nativeBuildInputs = [ setuptools_scm ];

propagatedBuildInputs = [
attrs
py
setuptools
six
nbformat
colorama
pygments
tornado
requests
GitPython
notebook
jinja2
];

meta = with lib; {
homepage = https://github.com/jupyter/nbdime;
description = "Tools for diffing and merging of Jupyter notebooks.";
license = licenses.bsd3;
maintainers = with maintainers; [ tbenst ];
};
}
2 changes: 2 additions & 0 deletions pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
@@ -3968,6 +3968,8 @@ in {

nbmerge = callPackage ../development/python-modules/nbmerge { };

nbdime = callPackage ../development/python-modules/nbdime { };

nbxmpp = callPackage ../development/python-modules/nbxmpp { };

sleekxmpp = callPackage ../development/python-modules/sleekxmpp { };