Show More
@@ -0,0 +1,15 b'' | |||||
|
1 | This patch allows handling directories inside the refs/heads. This was added in dulwich | |||
|
2 | 0.19.X series | |||
|
3 | ||||
|
4 | diff -rup dulwich-0.13.0-orig/dulwich/refs.py dulwich-0.13.0/dulwich/refs.py | |||
|
5 | --- dulwich-0.13.0-orig/dulwich/refs.py 2018-10-09 09:42:38.182597268 +0200 | |||
|
6 | +++ dulwich-0.13.0/dulwich/refs.py 2018-10-09 09:43:39.057145566 +0200 | |||
|
7 | @@ -509,7 +509,7 @@ class DiskRefsContainer(RefsContainer): | |||
|
8 | # Read only the first 40 bytes | |||
|
9 | return header + f.read(40 - len(SYMREF)) | |||
|
10 | except IOError as e: | |||
|
11 | - if e.errno == errno.ENOENT: | |||
|
12 | + if e.errno in (errno.ENOENT, errno.EISDIR): | |||
|
13 | return None | |||
|
14 | raise | |||
|
15 |
@@ -1,53 +1,60 b'' | |||||
1 | # Overrides for the generated python-packages.nix |
|
1 | # Overrides for the generated python-packages.nix | |
2 | # |
|
2 | # | |
3 | # This function is intended to be used as an extension to the generated file |
|
3 | # This function is intended to be used as an extension to the generated file | |
4 | # python-packages.nix. The main objective is to add needed dependencies of C |
|
4 | # python-packages.nix. The main objective is to add needed dependencies of C | |
5 | # libraries and tweak the build instructions where needed. |
|
5 | # libraries and tweak the build instructions where needed. | |
6 |
|
6 | |||
7 | { pkgs |
|
7 | { pkgs | |
8 | , basePythonPackages |
|
8 | , basePythonPackages | |
9 | }: |
|
9 | }: | |
10 |
|
10 | |||
11 | let |
|
11 | let | |
12 | sed = "sed -i"; |
|
12 | sed = "sed -i"; | |
13 |
|
13 | |||
14 | in |
|
14 | in | |
15 |
|
15 | |||
16 | self: super: { |
|
16 | self: super: { | |
17 |
|
17 | |||
18 | "gevent" = super."gevent".override (attrs: { |
|
18 | "gevent" = super."gevent".override (attrs: { | |
19 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
19 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ | |
20 | # NOTE: (marcink) odd requirements from gevent aren't set properly, |
|
20 | # NOTE: (marcink) odd requirements from gevent aren't set properly, | |
21 | # thus we need to inject psutil manually |
|
21 | # thus we need to inject psutil manually | |
22 | self."psutil" |
|
22 | self."psutil" | |
23 | ]; |
|
23 | ]; | |
24 | }); |
|
24 | }); | |
25 |
|
25 | |||
26 | "hgsubversion" = super."hgsubversion".override (attrs: { |
|
26 | "hgsubversion" = super."hgsubversion".override (attrs: { | |
27 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ |
|
27 | propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ | |
28 | pkgs.sqlite |
|
28 | pkgs.sqlite | |
29 | #basePythonPackages.sqlite3 |
|
29 | #basePythonPackages.sqlite3 | |
30 | self.mercurial |
|
30 | self.mercurial | |
31 | ]; |
|
31 | ]; | |
32 | }); |
|
32 | }); | |
33 |
|
33 | |||
34 | "subvertpy" = super."subvertpy".override (attrs: { |
|
34 | "subvertpy" = super."subvertpy".override (attrs: { | |
35 | SVN_PREFIX = "${pkgs.subversion.dev}"; |
|
35 | SVN_PREFIX = "${pkgs.subversion.dev}"; | |
36 | propagatedBuildInputs = [ |
|
36 | propagatedBuildInputs = [ | |
37 | pkgs.apr.dev |
|
37 | pkgs.apr.dev | |
38 | pkgs.aprutil |
|
38 | pkgs.aprutil | |
39 | pkgs.subversion |
|
39 | pkgs.subversion | |
40 | ]; |
|
40 | ]; | |
41 | }); |
|
41 | }); | |
42 |
|
42 | |||
43 | "mercurial" = super."mercurial".override (attrs: { |
|
43 | "mercurial" = super."mercurial".override (attrs: { | |
44 | propagatedBuildInputs = [ |
|
44 | propagatedBuildInputs = [ | |
45 | # self.python.modules.curses |
|
45 | # self.python.modules.curses | |
46 | ]; |
|
46 | ]; | |
47 | }); |
|
47 | }); | |
48 |
|
48 | |||
|
49 | "dulwich" = super."dulwich".override (attrs: { | |||
|
50 | patches = [ | |||
|
51 | ./patches/dulwich/handle-dir-refs.patch | |||
|
52 | ]; | |||
|
53 | }); | |||
|
54 | ||||
|
55 | ||||
49 | # Avoid that base packages screw up the build process |
|
56 | # Avoid that base packages screw up the build process | |
50 | inherit (basePythonPackages) |
|
57 | inherit (basePythonPackages) | |
51 | setuptools; |
|
58 | setuptools; | |
52 |
|
59 | |||
53 | } |
|
60 | } |
General Comments 0
You need to be logged in to leave comments.
Login now