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