Show More
@@ -1,47 +1,47 b'' | |||||
1 | self: super: { |
|
1 | self: super: { | |
2 | # bump GIT version |
|
2 | # bump GIT version | |
3 | git = super.lib.overrideDerivation super.git (oldAttrs: { |
|
3 | git = super.lib.overrideDerivation super.git (oldAttrs: { | |
4 |
name = "git-2.19. |
|
4 | name = "git-2.19.2"; | |
5 | src = self.fetchurl { |
|
5 | src = self.fetchurl { | |
6 |
url = "https://www.kernel.org/pub/software/scm/git/git-2.19. |
|
6 | url = "https://www.kernel.org/pub/software/scm/git/git-2.19.2.tar.xz"; | |
7 | sha256 = "1dfv43lmdnxz42504jc89sihbv1d4d6kgqcz3c5ji140kfm5cl1l"; |
|
7 | sha256 = "1scbggzghkzzfqg4ky3qh7h9w87c3zya4ls5disz7dbx56is7sgw"; | |
8 | }; |
|
8 | }; | |
9 |
|
9 | |||
10 | # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git |
|
10 | # patches come from: https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/version-management/git-and-tools/git | |
11 | patches = [ |
|
11 | patches = [ | |
12 | ./patches/git/docbook2texi.patch |
|
12 | ./patches/git/docbook2texi.patch | |
13 | ./patches/git/git-sh-i18n.patch |
|
13 | ./patches/git/git-sh-i18n.patch | |
14 | ./patches/git/ssh-path.patch |
|
14 | ./patches/git/ssh-path.patch | |
15 | ./patches/git/git-send-email-honor-PATH.patch |
|
15 | ./patches/git/git-send-email-honor-PATH.patch | |
16 | ./patches/git/installCheck-path.patch |
|
16 | ./patches/git/installCheck-path.patch | |
17 | ]; |
|
17 | ]; | |
18 |
|
18 | |||
19 | }); |
|
19 | }); | |
20 |
|
20 | |||
21 | # Override subversion derivation to |
|
21 | # Override subversion derivation to | |
22 | # - activate python bindings |
|
22 | # - activate python bindings | |
23 | subversion = |
|
23 | subversion = | |
24 | let |
|
24 | let | |
25 | subversionWithPython = super.subversion.override { |
|
25 | subversionWithPython = super.subversion.override { | |
26 | httpSupport = true; |
|
26 | httpSupport = true; | |
27 | pythonBindings = true; |
|
27 | pythonBindings = true; | |
28 | python = self.python27Packages.python; |
|
28 | python = self.python27Packages.python; | |
29 | }; |
|
29 | }; | |
30 | in |
|
30 | in | |
31 | super.lib.overrideDerivation subversionWithPython (oldAttrs: { |
|
31 | super.lib.overrideDerivation subversionWithPython (oldAttrs: { | |
32 | name = "subversion-1.10.2"; |
|
32 | name = "subversion-1.10.2"; | |
33 | src = self.fetchurl { |
|
33 | src = self.fetchurl { | |
34 | url = "https://archive.apache.org/dist/subversion/subversion-1.10.2.tar.gz"; |
|
34 | url = "https://archive.apache.org/dist/subversion/subversion-1.10.2.tar.gz"; | |
35 | sha256 = "0xv5z2bg0lw7057g913yc13f60nfj257wvmsq22pr33m4syf26sg"; |
|
35 | sha256 = "0xv5z2bg0lw7057g913yc13f60nfj257wvmsq22pr33m4syf26sg"; | |
36 | }; |
|
36 | }; | |
37 |
|
37 | |||
38 | ## use internal lz4/utf8proc because it is stable and shipped with SVN |
|
38 | ## use internal lz4/utf8proc because it is stable and shipped with SVN | |
39 | configureFlags = oldAttrs.configureFlags ++ [ |
|
39 | configureFlags = oldAttrs.configureFlags ++ [ | |
40 | " --with-lz4=internal" |
|
40 | " --with-lz4=internal" | |
41 | " --with-utf8proc=internal" |
|
41 | " --with-utf8proc=internal" | |
42 | ]; |
|
42 | ]; | |
43 |
|
43 | |||
44 |
|
44 | |||
45 | }); |
|
45 | }); | |
46 |
|
46 | |||
47 | } |
|
47 | } |
General Comments 0
You need to be logged in to leave comments.
Login now