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