git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #171174 from marsam/update-breezy
commit97d1fb40c1e7da6b3792880b5d7b0534be9e53c5 authorSandro <sandro.jaeckel@gmail.com> dateWed 4 May 2022, 20:55 (5 years ago) parent833b0ae95fd917
3 files changed+48−5
pkgs/development/python-modules/breezy/default.nix+20−5 pkgs/development/python-modules/fastbencode/default.nix+26 pkgs/top-level/python-packages.nix+2
pkgs/development/python-modules/breezy/default.nix+20−5
@@ -3,23 +3,36 @@
33, fetchPypi
44, configobj
55, patiencediff
6−, six
6+, fastbencode
77, fastimport
88, dulwich
99, launchpadlib
1010, testtools
11+, pythonOlder
12+, installShellFiles
1113}:
1214
1315buildPythonPackage rec {
1416 pname = "breezy";
15− version = "3.2.1";
17+ version = "3.2.2";
18+
19+ disabled = pythonOlder "3.5";
1620
1721 src = fetchPypi {
1822 inherit pname version;
19− sha256 = "sha256-4LJo6xoooq8EUoDDfQIa4y1/8XX0ybmfM6rX2wsp2Fw=";
23+ sha256 = "sha256-GHpuRSCN0F2BdQc2cgyDcQz0gJT1R+xAgcVxJZVZpNU=";
2024 };
2125
22− propagatedBuildInputs = [ configobj patiencediff six fastimport dulwich launchpadlib ];
26+ nativeBuildInputs = [ installShellFiles ];
27+
28+ propagatedBuildInputs = [
29+ configobj
30+ fastbencode
31+ patiencediff
32+ fastimport
33+ dulwich
34+ launchpadlib
35+ ];
2336
2437 checkInputs = [ testtools ];
2538
@@ -29,6 +42,8 @@ buildPythonPackage rec {
2942 # symlink for bazaar compatibility
3043 postInstall = ''
3144 ln -s "$out/bin/brz" "$out/bin/bzr"
45+
46+ installShellCompletion --cmd brz --bash contrib/bash/brz
3247 '';
3348
3449 pythonImportsCheck = [ "breezy" ];
@@ -36,7 +51,7 @@ buildPythonPackage rec {
3651 meta = with lib; {
3752 description = "Friendly distributed version control system";
3853 homepage = "https://www.breezy-vcs.org/";
39− license = licenses.gpl2;
54+ license = licenses.gpl2Only;
4055 maintainers = [ maintainers.marsam ];
4156 };
4257}
pkgs/development/python-modules/fastbencode/default.nixnew file+26
@@ -0,0 +1,26 @@
1+{ lib, buildPythonPackage, fetchPypi, python, cython }:
2+
3+buildPythonPackage rec {
4+ pname = "fastbencode";
5+ version = "0.0.7";
6+
7+ src = fetchPypi {
8+ inherit pname version;
9+ sha256 = "sha256-tryavlQtBmN5NSlXb0m6iJFQhVT4XQm11tXtevfgxuQ=";
10+ };
11+
12+ nativeBuildInputs = [ cython ];
13+
14+ pythonImportsCheck = [ "fastbencode" ];
15+
16+ checkPhase = ''
17+ ${python.interpreter} -m unittest fastbencode.tests.test_suite
18+ '';
19+
20+ meta = with lib; {
21+ description = "Fast implementation of bencode";
22+ homepage = "https://github.com/breezy-team/fastbencode";
23+ license = licenses.gpl2Only;
24+ maintainers = [ maintainers.marsam ];
25+ };
26+}
pkgs/top-level/python-packages.nix+2
@@ -2840,6 +2840,8 @@ in {
28402840
28412841 fastavro = callPackage ../development/python-modules/fastavro { };
28422842
2843+ fastbencode = callPackage ../development/python-modules/fastbencode { };
2844+
28432845 fastcache = callPackage ../development/python-modules/fastcache { };
28442846
28452847 fastcore = callPackage ../development/python-modules/fastcore { };