Show More
@@ -14,6 +14,20 b' let' | |||||
14 | url = http://www.repoze.org/LICENSE.txt; |
|
14 | url = http://www.repoze.org/LICENSE.txt; | |
15 | }; |
|
15 | }; | |
16 | }; |
|
16 | }; | |
|
17 | ||||
|
18 | # johbo: Interim bridge which allows us to build with the upcoming | |||
|
19 | # nixos.16.09 branch (unstable at the moment of writing this note) and the | |||
|
20 | # current stable nixos-16.03. | |||
|
21 | backwardsCompatibleFetchgit = { ... }@args: | |||
|
22 | let | |||
|
23 | origSources = pkgs.fetchgit args; | |||
|
24 | in | |||
|
25 | pkgs.lib.overrideDerivation origSources (oldAttrs: { | |||
|
26 | NIX_PREFETCH_GIT_CHECKOUT_HOOK = '' | |||
|
27 | find $out -name '.git*' -print0 | xargs -0 rm -rf | |||
|
28 | ''; | |||
|
29 | }); | |||
|
30 | ||||
17 | in |
|
31 | in | |
18 |
|
32 | |||
19 | self: super: { |
|
33 | self: super: { | |
@@ -96,7 +110,7 b' self: super: {' | |||||
96 | }); |
|
110 | }); | |
97 |
|
111 | |||
98 | py-gfm = super.py-gfm.override { |
|
112 | py-gfm = super.py-gfm.override { | |
99 |
src = |
|
113 | src = backwardsCompatibleFetchgit { | |
100 | url = "https://code.rhodecode.com/upstream/py-gfm"; |
|
114 | url = "https://code.rhodecode.com/upstream/py-gfm"; | |
101 | rev = "0d66a19bc16e3d49de273c0f797d4e4781e8c0f2"; |
|
115 | rev = "0d66a19bc16e3d49de273c0f797d4e4781e8c0f2"; | |
102 | sha256 = "0ryp74jyihd3ckszq31bml5jr3bciimhfp7va7kw6ld92930ksv3"; |
|
116 | sha256 = "0ryp74jyihd3ckszq31bml5jr3bciimhfp7va7kw6ld92930ksv3"; | |
@@ -120,7 +134,7 b' self: super: {' | |||||
120 |
|
134 | |||
121 | Pylons = super.Pylons.override (attrs: { |
|
135 | Pylons = super.Pylons.override (attrs: { | |
122 | name = "Pylons-1.0.1-patch1"; |
|
136 | name = "Pylons-1.0.1-patch1"; | |
123 |
src = |
|
137 | src = backwardsCompatibleFetchgit { | |
124 | url = "https://code.rhodecode.com/upstream/pylons"; |
|
138 | url = "https://code.rhodecode.com/upstream/pylons"; | |
125 | rev = "707354ee4261b9c10450404fc9852ccea4fd667d"; |
|
139 | rev = "707354ee4261b9c10450404fc9852ccea4fd667d"; | |
126 | sha256 = "b2763274c2780523a335f83a1df65be22ebe4ff413a7bc9e9288d23c1f62032e"; |
|
140 | sha256 = "b2763274c2780523a335f83a1df65be22ebe4ff413a7bc9e9288d23c1f62032e"; |
General Comments 0
You need to be logged in to leave comments.
Login now