diff options
| -rw-r--r-- | maintainers/maintainer-list.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/python-modules/breezy/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/python-modules/patiencediff/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
4 files changed, 32 insertions, 1 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 7f48ffbcc4a2..b52a26f140e1 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9464,6 +9464,16 @@ githubId = 19174984; name = "Alex Whitt"; }; + wildsebastian = { + name = "Sebastian Wild"; + email = "sebastian@wild-siena.com"; + github = "wildsebastian"; + githubId = 1215623; + keys = [{ + longkeyid = "rsa4096/0x366A2940479A06FC"; + fingerprint = "DA03 D6C6 3F58 E796 AD26 E99B 366A 2940 479A 06FC"; + }]; + }; willibutz = { email = "willibutz@posteo.de"; github = "willibutz"; diff --git a/pkgs/development/python-modules/breezy/default.nix b/pkgs/development/python-modules/breezy/default.nix index 55fb8deb5fc3..21d0b6d9f308 100644 --- a/pkgs/development/python-modules/breezy/default.nix +++ b/pkgs/development/python-modules/breezy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchPypi , configobj +, patiencediff , six , fastimport , dulwich @@ -18,7 +19,7 @@ buildPythonPackage rec { sha256 = "1eff207403f48898fa3b3ffa7a4275197c6c58fec105ef267caf1f5fd5a6c7be"; }; - propagatedBuildInputs = [ configobj six fastimport dulwich launchpadlib ]; + propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ]; checkInputs = [ testtools ]; diff --git a/pkgs/development/python-modules/patiencediff/default.nix b/pkgs/development/python-modules/patiencediff/default.nix new file mode 100644 index 000000000000..921fbe4c4312 --- /dev/null +++ b/pkgs/development/python-modules/patiencediff/default.nix @@ -0,0 +1,18 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "patiencediff"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nm2242xgg59l06m54rzxp41aly3lxjh0a1s7h6dk7ryxjh002lv"; + }; + + meta = with lib; { + description = "C implementation of patiencediff algorithm for Python"; + homepage = "https://github.com/breezy-team/patiencediff"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.wildsebastian ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 159b43da72b8..a316cc2ce91c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4486,6 +4486,8 @@ in { pathtools = callPackage ../development/python-modules/pathtools { }; + patiencediff = callPackage ../development/python-modules/patiencediff { }; + patool = callPackage ../development/python-modules/patool { }; patsy = callPackage ../development/python-modules/patsy { }; |