Show More
@@ -1,71 +1,83 b'' | |||
|
1 | 1 | self: super: { |
|
2 | 2 | |
|
3 | 3 | # bump GIT version |
|
4 | git = super.lib.overrideDerivation super.git (oldAttrs: { | |
|
5 | name = "git-2.27.0"; | |
|
4 | git = | |
|
5 | let | |
|
6 | gitWithoutPerl = super.git.override { | |
|
7 | #perlSupport = false; | |
|
8 | }; | |
|
9 | in | |
|
10 | super.lib.overrideDerivation gitWithoutPerl (oldAttrs: { | |
|
11 | ||
|
12 | name = "git-2.30.0"; | |
|
6 | 13 | src = self.fetchurl { |
|
7 |
url = "https://www.kernel.org/pub/software/scm/git/git-2. |
|
|
8 | sha256 = "1ybk39ylvs32lywq7ra4l2kdr5izc80r9461hwfnw8pssxs9gjkk"; | |
|
14 | url = "https://www.kernel.org/pub/software/scm/git/git-2.30.0.tar.xz"; | |
|
15 | sha256 = "06ad6dylgla34k9am7d5z8y3rryc8ln3ibq5z0d74rcm20hm0wsm"; | |
|
9 | 16 | }; |
|
10 | 17 | |
|
11 | 18 | # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git |
|
12 | 19 | patches = [ |
|
13 | 20 | ./patches/git/docbook2texi.patch |
|
14 | 21 | ./patches/git/git-sh-i18n.patch |
|
15 | 22 | ./patches/git/ssh-path.patch |
|
16 | 23 | ./patches/git/git-send-email-honor-PATH.patch |
|
17 | 24 | ./patches/git/installCheck-path.patch |
|
18 | 25 | ]; |
|
19 | 26 | |
|
27 | #preInstallCheck = oldAttrs.preInstallCheck + '' | |
|
28 | # disable_test t4129-apply-samemode | |
|
29 | # disable_test t5324-split-commit-graph | |
|
30 | #''; | |
|
31 | ||
|
20 | 32 | }); |
|
21 | 33 | |
|
22 | 34 | libgit2rc = super.lib.overrideDerivation super.libgit2 (oldAttrs: { |
|
23 | 35 | name = "libgit2-0.28.2"; |
|
24 | 36 | version = "0.28.2"; |
|
25 | 37 | |
|
26 | 38 | src = self.fetchFromGitHub { |
|
27 | 39 | owner = "libgit2"; |
|
28 | 40 | repo = "libgit2"; |
|
29 | 41 | rev = "v0.28.2"; |
|
30 | 42 | sha256 = "0cm8fvs05rj0baigs2133q5a0sm3pa234y8h6hmwhl2bz9xq3k4b"; |
|
31 | 43 | }; |
|
32 | 44 | |
|
33 | 45 | cmakeFlags = [ "-DTHREADSAFE=ON" "-DUSE_HTTPS=no"]; |
|
34 | 46 | |
|
35 | 47 | buildInputs = [ |
|
36 | 48 | super.zlib |
|
37 | 49 | super.libssh2 |
|
38 | 50 | super.openssl |
|
39 | 51 | super.curl |
|
40 | 52 | ]; |
|
41 | 53 | |
|
42 | 54 | |
|
43 | 55 | }); |
|
44 | 56 | |
|
45 | 57 | # Override subversion derivation to |
|
46 | 58 | # - activate python bindings |
|
47 | 59 | subversion = |
|
48 | 60 | let |
|
49 | 61 | subversionWithPython = super.subversion.override { |
|
50 | 62 | httpSupport = true; |
|
51 | 63 | pythonBindings = true; |
|
52 | 64 | python = self.python27Packages.python; |
|
53 | 65 | }; |
|
54 | 66 | in |
|
55 | 67 | super.lib.overrideDerivation subversionWithPython (oldAttrs: { |
|
56 | 68 | name = "subversion-1.13.0"; |
|
57 | 69 | src = self.fetchurl { |
|
58 | 70 | url = "https://archive.apache.org/dist/subversion/subversion-1.13.0.tar.gz"; |
|
59 | 71 | sha256 = "0cb9p7f5hg0l4k32hz8vmvy2r45igchq5sh4m366za5q0c649bfs"; |
|
60 | 72 | }; |
|
61 | 73 | |
|
62 | 74 | ## use internal lz4/utf8proc because it is stable and shipped with SVN |
|
63 | 75 | configureFlags = oldAttrs.configureFlags ++ [ |
|
64 | 76 | " --with-lz4=internal" |
|
65 | 77 | " --with-utf8proc=internal" |
|
66 | 78 | ]; |
|
67 | 79 | |
|
68 | 80 | }); |
|
69 | 81 | |
|
70 | 82 | |
|
71 | 83 | } |
General Comments 0
You need to be logged in to leave comments.
Login now