##// END OF EJS Templates
patches: organize into a single directory.
marcink -
r560:18084915 default
parent child Browse files
Show More
@@ -1,45 +1,45 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.17.2";
4 name = "git-2.17.2";
5 src = self.fetchurl {
5 src = self.fetchurl {
6 url = "https://www.kernel.org/pub/software/scm/git/git-2.17.2.tar.xz";
6 url = "https://www.kernel.org/pub/software/scm/git/git-2.17.2.tar.xz";
7 sha256 = "1ghljlxmyqphx13qspy382cpl2pbkbwbhqm7w7z57r9mkhswx668";
7 sha256 = "1ghljlxmyqphx13qspy382cpl2pbkbwbhqm7w7z57r9mkhswx668";
8 };
8 };
9
9
10 patches = [
10 patches = [
11 ./git_patches/docbook2texi.patch
11 ./patches/git/docbook2texi.patch
12 ./git_patches/symlinks-in-bin.patch
12 ./patches/git/symlinks-in-bin.patch
13 ./git_patches/git-sh-i18n.patch
13 ./patches/git/git-sh-i18n.patch
14 ./git_patches/ssh-path.patch
14 ./patches/git/ssh-path.patch
15 ];
15 ];
16
16
17 });
17 });
18
18
19 # Override subversion derivation to
19 # Override subversion derivation to
20 # - activate python bindings
20 # - activate python bindings
21 subversion =
21 subversion =
22 let
22 let
23 subversionWithPython = super.subversion.override {
23 subversionWithPython = super.subversion.override {
24 httpSupport = true;
24 httpSupport = true;
25 pythonBindings = true;
25 pythonBindings = true;
26 python = self.python27Packages.python;
26 python = self.python27Packages.python;
27 };
27 };
28 in
28 in
29 super.lib.overrideDerivation subversionWithPython (oldAttrs: {
29 super.lib.overrideDerivation subversionWithPython (oldAttrs: {
30 name = "subversion-1.10.2";
30 name = "subversion-1.10.2";
31 src = self.fetchurl {
31 src = self.fetchurl {
32 url = "https://archive.apache.org/dist/subversion/subversion-1.10.2.tar.gz";
32 url = "https://archive.apache.org/dist/subversion/subversion-1.10.2.tar.gz";
33 sha256 = "0xv5z2bg0lw7057g913yc13f60nfj257wvmsq22pr33m4syf26sg";
33 sha256 = "0xv5z2bg0lw7057g913yc13f60nfj257wvmsq22pr33m4syf26sg";
34 };
34 };
35
35
36 ## use internal lz4/utf8proc because it is stable and shipped with SVN
36 ## use internal lz4/utf8proc because it is stable and shipped with SVN
37 configureFlags = oldAttrs.configureFlags ++ [
37 configureFlags = oldAttrs.configureFlags ++ [
38 " --with-lz4=internal"
38 " --with-lz4=internal"
39 " --with-utf8proc=internal"
39 " --with-utf8proc=internal"
40 ];
40 ];
41
41
42
42
43 });
43 });
44
44
45 }
45 }
1 NO CONTENT: file renamed from pkgs/git_patches/docbook2texi.patch to pkgs/patches/git/docbook2texi.patch
NO CONTENT: file renamed from pkgs/git_patches/docbook2texi.patch to pkgs/patches/git/docbook2texi.patch
1 NO CONTENT: file renamed from pkgs/git_patches/git-sh-i18n.patch to pkgs/patches/git/git-sh-i18n.patch
NO CONTENT: file renamed from pkgs/git_patches/git-sh-i18n.patch to pkgs/patches/git/git-sh-i18n.patch
1 NO CONTENT: file renamed from pkgs/git_patches/ssh-path.patch to pkgs/patches/git/ssh-path.patch
NO CONTENT: file renamed from pkgs/git_patches/ssh-path.patch to pkgs/patches/git/ssh-path.patch
General Comments 0
You need to be logged in to leave comments. Login now