Show More
@@ -14,6 +14,16 b' let pkgs_ = pkgs; in' | |||||
14 |
|
14 | |||
15 | let |
|
15 | let | |
16 | pkgs = pkgs_.overridePackages (self: super: { |
|
16 | pkgs = pkgs_.overridePackages (self: super: { | |
|
17 | # bump GIT version | |||
|
18 | git = pkgs.lib.overrideDerivation pkgs_.git (oldAttrs: { | |||
|
19 | name = "git-2.9.3"; | |||
|
20 | src = pkgs.fetchurl { | |||
|
21 | url = "https://www.kernel.org/pub/software/scm/git/git-2.9.3.tar.xz"; | |||
|
22 | sha256 = "0qzs681a64k3shh5p0rg41l1z16fbk5sj0xga45k34hp1hsp654z"; | |||
|
23 | }; | |||
|
24 | ||||
|
25 | }); | |||
|
26 | ||||
17 | # Override subversion derivation to |
|
27 | # Override subversion derivation to | |
18 | # - activate python bindings |
|
28 | # - activate python bindings | |
19 | subversion = let |
|
29 | subversion = let | |
@@ -22,13 +32,17 b' let' | |||||
22 | pythonBindings = true; |
|
32 | pythonBindings = true; | |
23 | python = self.python27Packages.python; |
|
33 | python = self.python27Packages.python; | |
24 | }; |
|
34 | }; | |
25 | in pkgs.lib.overrideDerivation subversionWithPython (oldAttrs: { |
|
35 | ||
|
36 | in | |||
|
37 | ||||
|
38 | pkgs.lib.overrideDerivation subversionWithPython (oldAttrs: { | |||
26 | patches = (oldAttrs.patches or []) ++ |
|
39 | patches = (oldAttrs.patches or []) ++ | |
27 | pkgs.lib.optionals pkgs.stdenv.isDarwin [ |
|
40 | pkgs.lib.optionals pkgs.stdenv.isDarwin [ | |
28 | # johbo: "import svn.client" fails on darwin currently. |
|
41 | # johbo: "import svn.client" fails on darwin currently. | |
29 | ./pkgs/subversion-1.9.4-darwin.patch |
|
42 | ./pkgs/subversion-1.9.4-darwin.patch | |
30 | ]; |
|
43 | ]; | |
31 | }); |
|
44 | }); | |
|
45 | ||||
32 | }); |
|
46 | }); | |
33 |
|
47 | |||
34 | inherit (pkgs.lib) fix extends; |
|
48 | inherit (pkgs.lib) fix extends; |
General Comments 0
You need to be logged in to leave comments.
Login now