Skip to content

Commit ddf864f

Browse files
committedJun 30, 2017
Merge branch 'master' into staging
Mass rebuilds from master (>7k on x86_64-linux).
2 parents c53449c + f0c3e5f commit ddf864f

File tree

204 files changed

+4670
-3204
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+4670
-3204
lines changed
 

Diff for: ‎doc/languages-frameworks/go.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ standard Go programs.
1313
deis = buildGoPackage rec {
1414
name = "deis-${version}";
1515
version = "1.13.0";
16-
16+
1717
goPackagePath = "github.com/deis/deis"; <co xml:id='ex-buildGoPackage-1' />
1818
subPackages = [ "client" ]; <co xml:id='ex-buildGoPackage-2' />
1919

@@ -130,6 +130,9 @@ the following arguments are of special significance to the function:
130130

131131
</para>
132132

133+
<para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>.
134+
It can produce complete derivation and <varname>goDeps</varname> file for Go programs.</para>
135+
133136
<para>
134137
<varname>buildGoPackage</varname> produces <xref linkend='chap-multiple-output' xrefstyle="select: title" />
135138
where <varname>bin</varname> includes program binaries. You can test build a Go binary as follows:
@@ -160,7 +163,4 @@ done
160163
</screen>
161164
</para>
162165

163-
<para>To extract dependency information from a Go package in automated way use <link xlink:href="https://github.com/kamilchm/go2nix">go2nix</link>.
164-
It can produce complete derivation and <varname>goDeps</varname> file for Go programs.</para>
165166
</section>
166-

Diff for: ‎lib/maintainers.nix

+4
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@
147147
dmjio = "David Johnson <djohnson.m@gmail.com>";
148148
dochang = "Desmond O. Chang <dochang@gmail.com>";
149149
domenkozar = "Domen Kozar <domen@dev.si>";
150+
dotlambda = "Robert Schütz <rschuetz17@gmail.com>";
150151
doublec = "Chris Double <chris.double@double.co.nz>";
151152
dpaetzel = "David Pätzel <david.a.paetzel@gmail.com>";
152153
drets = "Dmytro Rets <dmitryrets@gmail.com>";
@@ -182,6 +183,7 @@
182183
fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
183184
fare = "Francois-Rene Rideau <fahree@gmail.com>";
184185
falsifian = "James Cook <james.cook@utoronto.ca>";
186+
florianjacob = "Florian Jacob <projects+nixos@florianjacob.de>";
185187
flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
186188
fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
187189
fmthoma = "Franz Thoma <f.m.thoma@googlemail.com>";
@@ -246,6 +248,7 @@
246248
jensbin = "Jens Binkert <jensbin@protonmail.com>";
247249
jerith666 = "Matt McHenry <github@matt.mchenryfamily.org>";
248250
jfb = "James Felix Black <james@yamtime.com>";
251+
jfrankenau = "Johannes Frankenau <johannes@frankenau.net>";
249252
jgeerds = "Jascha Geerds <jascha@jgeerds.name>";
250253
jgertm = "Tim Jaeger <jger.tm@gmail.com>";
251254
jgillich = "Jakob Gillich <jakob@gillich.me>";
@@ -550,6 +553,7 @@
550553
tokudan = "Daniel Frank <git@danielfrank.net>";
551554
tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
552555
travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
556+
trevorj = "Trevor Joynson <nix@trevor.joynson.io>";
553557
trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
554558
tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>";
555559
ttuegel = "Thomas Tuegel <ttuegel@mailbox.org>";

0 commit comments

Comments
 (0)
Please sign in to comment.