Commit Graph

847 Commits

Author SHA1 Message Date
Itai Zukerman
25121d4350 bazel: 0.3.2 -> 0.4.4 2017-02-13 16:12:26 -08:00
Nikolay Amiantov
003fa8fed5 gn: remove
Chromium depends on bundled versioon of gn. It's also chromium-specific build
tool, so it's not feasible to package.
2017-02-08 22:52:40 +03:00
Fernando J Pando
34b5c9a4de buildbot: 0.9.0.post1 -> 0.9.3
- Fixes unneeded patching
- Adds worker to build inputs now needed for tests
- Replaces enableworker option with worker configuration module
- Openssh required for tests
- Fixes worker hardcoded paths
- Tested on Nixos Unstable
2017-02-07 11:14:42 -05:00
Herwig Hochleitner
67ccc41a67 leiningen: 2.6.1 -> 2.7.1 (#22485) 2017-02-06 08:44:20 +01:00
Eelco Dolstra
35349b6c2a
gup: 0.5.5 -> 0.6.0 2017-01-30 11:44:15 +01:00
Eelco Dolstra
12dd086c39
Revert "gup: 0.5.5 -> 0.6.0 and derivation update"
This reverts commit a59c3038cd due to
use of importJSON.
2017-01-30 11:44:15 +01:00
Michael Raskin
1d44213c7e Merge pull request #21516 from timbertson/gup
gup: 0.5.5 -> 0.6.0 and extract src into JSON
2017-01-26 07:46:16 +00:00
Tim Cuthbertson
a59c3038cd gup: 0.5.5 -> 0.6.0 and derivation update 2017-01-25 22:25:31 +11:00
romildo
a0d29cf33e drake: init at 0.9.2.0.3.1 2017-01-24 16:36:22 -02:00
Jörg Thalheim
ffbcea3ce5
rake: use gemdir 2017-01-18 00:52:57 +01:00
Graham Christensen
6b504f8b52 Merge pull request #21626 from NeQuissimus/gradle_3_3
gradle: 3.2.1 -> 3.3
2017-01-03 18:45:42 -05:00
Tim Steinbach
02efac3f9f
gradle: 3.2.1 -> 3.3 2017-01-03 17:38:01 -05:00
Daiderd Jordan
538d1b688a stdenv: bootstrap cmake and python on darwin 2017-01-03 18:01:47 +01:00
Michael Raskin
31106095e1 scons: 2.5.0 -> 2.5.1 2017-01-02 20:18:52 +01:00
Daiderd Jordan
481569e580 Merge pull request #21339 from sifmelcara/add/crystal-lang
crystal: init at 0.20.3
2016-12-24 23:14:58 +01:00
mingchuan
6db2c983c1 shards: init at 0.7.1
Dependency manager for the Crystal language
2016-12-25 01:14:19 +08:00
Aristid Breitkreuz
76c4b5fcca cmake: 3.6.2 -> 3.7.1 2016-12-20 16:20:08 +01:00
Fernando J Pando
50466c2d4f
buildbot: 0.9.0rc4 -> 0.9.0.post1
- updates buildbot to version 9 release
- adds nixos configuration module
- fixes buildbot-www package deps
- re-hardcode path to tail
- builbot configuration via module vars

fixes #19759
2016-12-13 10:52:56 +01:00
Eric Bailey
ab9688a63a rebar3: Fix typos and support name-version-tag
The fixup_app_name/1 change notably supports packages like proper-1.1.1-beta.
2016-12-08 00:11:41 +02:00
Eric Bailey
fe727a19c1 rebar3: 3.1.0 -> 3.3.2 2016-12-08 00:11:41 +02:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Frederik Rietdijk
9b88697bbd gn: use python2 2016-11-24 22:28:04 +01:00
Tim Steinbach
dc9f2c903e
gradle: 3.2 -> 3.2.1 2016-11-23 16:48:58 -05:00
Tim Steinbach
2896042738
gradle: Add variable nativeVersion 2016-11-15 18:38:48 -05:00
Tim Steinbach
f11b7cf579
gradle: 3.1 -> 3.2 2016-11-15 16:11:29 -05:00
aszlig
c67a7ee731
Merge branch 'chromium-update-with-gn'
This brings in the new stable version 54 which also introduces a lot of
security fixes:

  CVE-2016-5198: Out of bounds memory access in V8
  CVE-2016-5181: Universal XSS in Blink
  CVE-2016-5182: Heap overflow in Blink
  CVE-2016-5183: Use after free in PDFium
  CVE-2016-5184: Use after free in PDFium
  CVE-2016-5185: Use after free in Blink
  CVE-2016-5187: URL spoofing
  CVE-2016-5188: UI spoofing
  CVE-2016-5192: Cross-origin bypass in Blink
  CVE-2016-5189: URL spoofing
  CVE-2016-5186: Out of bounds read in DevTools
  CVE-2016-5191: Universal XSS in Bookmarks
  CVE-2016-5190: Use after free in Internals
  CVE-2016-5193: Scheme bypass

Detailed announcements about these changes can be found here (latest to
oldest):

https://googlechromereleases.blogspot.de/2016/11/stable-channel-update-for-desktop.html
https://googlechromereleases.blogspot.de/2016/10/stable-channel-update-for-desktop_20.html
https://googlechromereleases.blogspot.de/2016/10/stable-channel-update-for-desktop.html

The update process of Chromium has been a bit bumpy on our side, because
version 54 also did the switch from GYP to GN so it wasn't just a matter
of updating the upstream-info file.

I've tested the Flash plugin (which runs fine) and WideVine manually,
although I couldn't get WideVine to work (I was running this within a VM
though).

So if people want to use WideVine they need to use Chrome instead until
we got this sorted out.

VM test results along with builds for all platforms can be found here:

https://headcounter.org/hydra/eval/339328

I'm going to backport these changes to stable as soon as the
tests/builds succeed there as well.

Closes: #19565
Closes: #20120
2016-11-09 09:55:31 +01:00
Tobias Geerinckx-Rice
8de2eeec33
icmake: 9.00.00 -> 9.02.02 2016-11-09 02:24:28 +01:00
aszlig
09f87eeb7f
gn: Init at 0.0.0.20161008
This is the standalone version of GN used currently solely for building
Chromium. An upstream bug report is available at
https://crbug.com/504074 to support a standalone build without needing
various components from the Chromium source tree.

Because there isn't a standalone vrsion available, I'm choosing
0.0.0.${date} as the version scheme here so that we don't conflict with
versioned releases from upstream someday[TM].

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-11-08 20:11:48 +01:00
Vladimír Čunát
f77801d88d Merge branch 'master' into staging 2016-11-06 11:26:02 +01:00
Tobias Geerinckx-Rice
784bd713cc
dub: 1.0.0 -> 1.1.0 2016-11-05 18:44:11 +01:00
Shea Levy
ca4b43d180 Merge branch 'master' into staging 2016-11-04 22:57:07 -04:00
Tim Steinbach
1368ff89a0
remake: 3.82 -> 4.1 2016-11-04 10:14:00 -04:00
Pavel Chuprikov
6693e3b06c bear: ignore wrapper calls (#20070)
Fixes #20056
2016-11-03 15:27:03 +01:00
Pavel Chuprikov
6f17cb108d bear: 2.2.0 -> 2.2.1
Taken from #20020.
2016-11-02 18:34:44 +01:00
Tuomas Tynkkynen
d0ae7b973d Merge remote-tracking branch 'upstream/master' into staging 2016-10-31 20:13:06 +02:00
Vladimír Čunát
31f0fdef32
cmake: minor update 3.6.0 -> 3.6.2 2016-10-29 22:08:25 +02:00
Vladimír Čunát
135a914ded
Merge #19514: cmake: improve if without glibc
and bootstrap in parallel.
2016-10-29 17:08:50 +02:00
Vladimír Čunát
e78ef9cc12
gnumake-3.81: remove
It doesn't seem to be of any use, except for spitting warnings about md5.
2016-10-29 15:49:27 +02:00
Tim Steinbach
a79fdce0b8
sbt: 0.13.12 -> 0.13.13 2016-10-28 14:08:20 -04:00
Frederik Rietdijk
f42a7068da scons: use python2 and refactor expression 2016-10-18 23:14:32 +02:00
Will Dietz
48d7c7751a cmake: bootstrap in parallel
Builds on previous commit so this happens without needing stdenv.glibc.
2016-10-13 08:07:58 -05:00
Will Dietz
07849e749a cmake: When there is no stdenv.glibc, still fix search paths.
Apply all of the fixups from preConfigure as well!

For testing purposes I added the following assert:

assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc);

To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?)
wasn't changed, which passes in the configurations I could think of.

Not including that since it seems like a bad requirement moving forward.
2016-10-13 08:05:37 -05:00
Frederik Rietdijk
67005e3c79 Merge pull request #19230 from nand0p/buildbot-9rc4
buildbot: 0.9.0rc3 -> 0.9.0rc4
2016-10-11 17:00:41 +02:00
sternenseemann
2dca4f7ded meson: 0.32.0 -> 0.35.0 2016-10-10 16:03:33 +02:00
Benjamin Staffin
d42fb35713 bazel: Allow linux i686 builds too 2016-10-09 15:18:29 -04:00
Irene Knapp
81c82bb5d6 Update the packaged Bazel to 0.3.2, and also make it actually work. 2016-10-08 20:54:12 -07:00
Fernando J Pando
5173cdb9cb buildbot: 0.9.0rc3 -> 0.9.0rc4
- upgrade to rc4
- un-hardcode path in logwatcher
- fix shebang in wrapper
- add gpl2 license
- remove duplicate wrapper

Tested on CentOS and NixOS
2016-10-05 11:08:01 -04:00
Tim Steinbach
084fa30411 gradle: 3.0 -> 3.1 (#18898) 2016-09-24 00:57:09 +02:00
Tom Hunger
93c773391d bazel: 20150326.981b7bc1 -> 0.3.1 2016-09-21 18:42:43 +01:00
Eelco Dolstra
e03d1ababa cmake-2.8: Fix build
The use of multiple outputs in libarchive broke it. Since this is an
ancient version of cmake, let's fix it by just using
--no-system-libarchive.
2016-09-20 11:56:11 +02:00
Fernando J Pando
b31b262623 buildbot: 0.9.0rc3 wrapper fix
- Tested on Linux
- Tested binary execution
- Fixes missing PYTHONPATH
2016-09-16 16:27:49 -04:00
Fernando J Pando
57726b54af Remove obsolete buildbot slave
buildbot-slave has been replaced with buildbot-worker.
2016-09-16 11:20:26 -04:00
Fernando J Pando
164036d728 buildbot: 0.9.0rc2 -> 0.9.0rc3
Tested on Linux
Tested Binary Execution
2016-09-16 11:20:02 -04:00
Franz Pletz
fb9117efa6 Merge pull request #18488 from chris-martin/md5-2
Miscellaneous packages: Use sha256 instead of md5 (part 2)
2016-09-13 07:11:43 +02:00
Chris Martin
d1e23ed8ed mk: md5->sha256 2016-09-10 14:08:26 -04:00
Chris Martin
5a3560fecf gnumake-3.80: md5->sha256 2016-09-10 14:06:13 -04:00
Michael Raskin
dabf09aa92 cmake: update setup-hook to take -isystem instead of -I into account 2016-09-08 09:10:00 +02:00
Tuomas Tynkkynen
3364230d56 Disable bunch of non-compiling packages on Darwin
These ones have a "Last successful build" timestamp in the 2014s or
2015s. Presumably no one will notice if we now stop building them.

softether_4_18              2015-09-20  http://hydra.nixos.org/build/39418483
lensfun                     2014-09-30  http://hydra.nixos.org/build/39394104
net_snmp                    2015-09-20  http://hydra.nixos.org/build/39410553
djview                      2015-08-11  http://hydra.nixos.org/build/39413233
libmusicbrainz2             2015-09-20  http://hydra.nixos.org/build/39410106
fox_1_6                     2014-05-07  http://hydra.nixos.org/build/39410858
libofx                      2015-09-24  http://hydra.nixos.org/build/39423507
yacas                       2014-09-30  http://hydra.nixos.org/build/39393150
iomelt                      2014-09-30  http://hydra.nixos.org/build/39408486
softether                   2015-09-20  http://hydra.nixos.org/build/39425800
mp4v2                       2014-09-30  http://hydra.nixos.org/build/39421899
virtuoso7                   2014-09-21  http://hydra.nixos.org/build/39415206
man_db                      2015-04-23  http://hydra.nixos.org/build/39404236
libdiscid                   2014-09-30  http://hydra.nixos.org/build/39412202
zabbix22.agent              2014-09-21  http://hydra.nixos.org/build/39412149
vidalia                     2015-08-06  http://hydra.nixos.org/build/39411500
libmtp                      2015-09-20  http://hydra.nixos.org/build/39419199
wxGTK29                     2015-09-20  http://hydra.nixos.org/build/39415296
ncmpcpp                     2015-11-06  http://hydra.nixos.org/build/39404455
libtorrent                  2014-09-21  http://hydra.nixos.org/build/39394646
shishi                      2014-03-21  http://hydra.nixos.org/build/39418874
ocaml_3_12_1                2014-09-30  http://hydra.nixos.org/build/39392996
djview4                     2015-08-11  http://hydra.nixos.org/build/39427799
vimNox                      2014-05-23  http://hydra.nixos.org/build/39397012
ttfautohint                 2015-08-06  http://hydra.nixos.org/build/39398330
libraw                      2015-09-24  http://hydra.nixos.org/build/39402271
wxGTK30                     2015-09-20  http://hydra.nixos.org/build/39401871
sbcl_1_2_5                  2015-09-20  http://hydra.nixos.org/build/39426091
prover9                     2014-09-30  http://hydra.nixos.org/build/39406476
rcs                         2015-08-25  http://hydra.nixos.org/build/39392037
gpac                        2015-09-24  http://hydra.nixos.org/build/39399470
virtuoso6                   2014-09-30  http://hydra.nixos.org/build/39398651
xlslib                      2015-09-24  http://hydra.nixos.org/build/39410387
ucommon                     2015-03-27  http://hydra.nixos.org/build/39414040
commoncpp2                  2014-09-30  http://hydra.nixos.org/build/39420117
virtuoso                    2014-09-21  http://hydra.nixos.org/build/39399978
miniHttpd                   2014-09-30  http://hydra.nixos.org/build/39392925
mpack                       2014-09-26  http://hydra.nixos.org/build/39399535
nbd                         2014-09-26  http://hydra.nixos.org/build/39401367
newsbeuter-dev              2014-07-29  http://hydra.nixos.org/build/39406259
gimp_2_8                    2015-09-20  http://hydra.nixos.org/build/39436271
gimp                        2015-09-20  http://hydra.nixos.org/build/39435976
zabbix20.agent              2014-09-30  http://hydra.nixos.org/build/39393242
gst_all_1.gst-plugins-good  2015-09-20  http://hydra.nixos.org/build/39408506
ocaml_4_00_1                2014-09-30  http://hydra.nixos.org/build/39399526
inadyn                      2014-09-30  http://hydra.nixos.org/build/39426389
gst_all_1.gst-plugins-bad   2015-09-20  http://hydra.nixos.org/build/39392970
zabbix.agent                2014-09-30  http://hydra.nixos.org/build/39421412
cmake-2_8                   2015-09-24  http://hydra.nixos.org/build/39399443
liblastfm                   2015-08-06  http://hydra.nixos.org/build/39421812
newsbeuter                  2014-07-29  http://hydra.nixos.org/build/39396605
sdcv                        2014-09-26  http://hydra.nixos.org/build/39412928
2016-09-01 20:39:33 +03:00
Frederik Rietdijk
f2fc64a412 Remove buildbot_8
We now have a newer version and the older version didn't work anymore
anyway because it depended on sqlalchemy7 which was itself broken,
because it depended on an older version of sqlite.
2016-09-01 17:46:27 +02:00
Tuomas Tynkkynen
8c4aeb1780 Merge staging into master
Brings in:
    - changed output order for multiple outputs:
      https://github.com/NixOS/nixpkgs/pull/14766
    - audit disabled by default
      https://github.com/NixOS/nixpkgs/pull/17916

 Conflicts:
	pkgs/development/libraries/openldap/default.nix
2016-09-01 13:27:27 +03:00
Fernando J Pando
d86114cbd5 buildbot: init at 0.9.0rc2
buildbot: init
buildbot-0.9.0rc2

buildbot-worker: init
buildbot-worker-0.9.0rc2

buildbot-ui: init
buildbot-www-0.9.0rc2

buildbot-full: init
buildbot-www-0.9.0rc1
buildbot-waterfall-view-0.9.0rc2
buildbot-console-view-0.9.0rc2
2016-09-01 11:31:15 +02:00
Frederik Rietdijk
7cf000b77e buildbot -> buildbot_8 2016-09-01 11:31:15 +02:00
Tuomas Tynkkynen
d3dc3d4130 Merge remote-tracking branch 'dezgeg/shuffle-outputs' into staging
https://github.com/NixOS/nixpkgs/pull/14766
2016-08-30 12:43:37 +03:00
Vladimír Čunát
f688ea37d8 bear: init at 2.2.0 2016-08-29 14:13:01 +02:00
Tuomas Tynkkynen
8ed3d6a7e5 cmake 2.8: Fix build with shuffled outputs 2016-08-29 14:49:52 +03:00
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Joachim F
56bfc0240e Merge pull request #17766 from NeQuissimus/gradle30
gradle: 2.14.1 -> 3.0, keep 2.14.1
2016-08-23 16:22:05 +02:00
Moritz Ulrich
08933f8a07 leiningen: Simplify build. 2016-08-23 12:38:24 +02:00
Joachim F
96ee6f08c6 Merge pull request #17923 from vrthra/redo-update
redo: update download URL
2016-08-23 01:20:14 +02:00
Tuomas Tynkkynen
74a3a2cd7e treewide: Use makeBinPath 2016-08-23 01:18:10 +03:00
Rahul Gopinath
746ec27c46 redo: update download URL 2016-08-22 13:37:59 -07:00
obadz
24a9183f90 Merge branch 'hardened-stdenv' into staging
Closes #12895

Amazing work by @globin & @fpletz getting hardened compiler flags by
enabled default on the whole package set
2016-08-22 01:19:35 +01:00
Matthew Bauer
c3974455eb gnustep: rescope everything into one folder
This should make merge conflicts easier to
handle. "gnustep" prefix has been removed to
make thing simpler. So "gnustep_make" is now
"make" within the gnustep scope.
2016-08-16 21:10:54 +00:00
Artyom Shalkhakov
d3d580ebbe gnustep: cleanup
Major clean-up. Everything builds fine.
2016-08-16 21:00:27 +00:00
Artyom Shalkhakov
15c5a533b5 gnustep: add gworkspace and systempreferences
Packaging some basic GNUstep apps: GWorkspace and SystemPreferences.

Unfortunately, GWorkspace doesn't work well, because gdomap, gdnc, gpbs
are not started. Also, there is some issue with fonts not being found.
2016-08-16 20:59:58 +00:00
Artyom Shalkhakov
ea3dcb3264 gnustep: add setup hook for make
Adding a setup-hook for gnustep-make.
2016-08-16 20:59:50 +00:00
Artyom Shalkhakov
4cbeef463c gnustep: use gnustep_builder
Built ProjectCenter and Gorm with the new gnustep_builder. Had to go
back and fix a few things.
2016-08-16 20:59:36 +00:00
Artyom Shalkhakov
d39e5372dc gnustep: cleanup
Cleaning up. Adding GNUstep package builder for abstracting out GNUstep
compilation specifics (with thanks to GitHub user lethalman).

The rules for using build_gnustep_package are as simple: any
GNUstep-based package that the package being compiled depends upon are
to be put in [deps] (this is used for setting up a buildEnv), while
other dependencies are put into [buildInputs] as usual.
2016-08-16 20:59:30 +00:00
Artyom Shalkhakov
52d17a5f41 gnustep: packageg libs separately
Packing gnustep libs separately, with no use of gnustep-startup. Also,
fixed a bug in WindowMaker package (some imaging dependencies were not supplied).
2016-08-16 20:59:08 +00:00
Tim Steinbach
6654b8274e
gradle: 2.14.1 -> 3.0, keep 2.14.1 2016-08-16 00:03:18 +00:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Vladimír Čunát
03e32315a5 Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1286624
2016-08-07 11:35:28 +02:00
Tuomas Tynkkynen
fcc3a1b41d bazel: Broken on i686
http://hydra.nixos.org/build/38314298
2016-08-06 17:06:45 +03:00
Tobias Geerinckx-Rice
06966f4955
icmake: 8.01.00 -> 9.00.00 2016-08-04 00:25:20 +02:00
Robin Gloster
c95ab0a2d1 gnumake380: disable format hardening 2016-08-03 20:03:04 +00:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms
Build-tested on x86_64 Linux & Mac.
2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2258b21e4b treewide: Add lots of platforms to packages with no meta
Build-tested on x86_64 Linux and on Darwin.
2016-08-02 21:17:44 +03:00
Alexey Shmalko
176f804f36 cmake: 3.4.3 -> 3.6.0 2016-08-02 10:32:52 -05:00
Julien Dehos
5286c0aebb cmake: add support for cxxtest 2016-08-01 22:11:00 +02:00
Alexey Shmalko
a18abd2aa3 meson: 0.26.0 -> 0.32.0 2016-07-24 00:34:19 +02:00
Gabriel Ebner
3016eb1c4b sbt: 0.13.11 -> 0.13.12 2016-07-21 12:29:14 +02:00
Tim Steinbach
3563be8dd6 gradle: 2.14 -> 2.14.1 2016-07-19 15:10:54 +00:00
Vladimír Čunát
40785f0dac Merge branch 'master' into staging
Hydra nixpkgs: ?compare=1282763
2016-07-12 22:00:10 +02:00
Eelco Dolstra
05bdc0c89f Remove unnecessary references to gcc5
These cause an unnecessary rebuild of gcc.
2016-07-11 10:46:34 +02:00
Vladimír Čunát
9d3228f99d gnumake42: bugfix 4.2 -> 4.2.1 2016-07-09 16:50:12 +02:00
Vladimír Čunát
3b2627586d Merge #16448: gnumake: optionally build with guile
Fixed up nested lists within the merge.
2016-07-09 16:36:49 +02:00
Tim Steinbach
e00c572698 gradle: 2.13 -> 2.14 2016-07-01 02:23:28 +00:00
Rahul Gopinath
021dd6a5f6 waf: 1.8.19 -> 1.9.0 2016-06-26 21:59:23 -07:00
Rahul Gopinath
586a9c0d9c gnumake: Allow guile extension language as an optional feature 2016-06-23 09:55:54 -07:00
Tobias Geerinckx-Rice
ffd2afd89d
dub: 0.9.25 -> 1.0.0 2016-06-20 19:34:19 +02:00
Moritz Ulrich
e72282be84 Merge pull request #16052 from dvc94ch/rust-cross
Rust and cargo improvements
2016-06-16 09:42:23 +02:00
Eric Merritt
864a0816c4 rebar3: remove no longer needed registrySnapshot.nix 2016-06-15 07:20:17 -07:00
Eric Merritt
b1cd08246f beamPackages: turn on debug_info for beam packages
This allows you to turn on debug infor for all the beam packages in the
system with a single change at the top level. This is required for
debugging and dialyzer work. It also allows you to switch it on on a
package by package basis.
2016-06-15 07:20:01 -07:00
David Craven
54f80775cb rust: Refactoring of rust and cargo packages 2016-06-15 12:47:13 +02:00
David Craven
0720373dfc cargo: Use stable releases instead of snapshots 2016-06-14 23:09:21 +02:00
Moritz Ulrich
b05f991f5f Rust infrastructure refactoring
Rust infrastructure updates & refactoring
2016-06-03 00:11:13 +02:00
David Craven
895db6daf3 Update cargo head 2016-06-02 17:15:52 +02:00
Thomas Tuegel
d5d4606190 Revert "cmake: use supplied RPATH instead of guessing"
This reverts commit 8ec5adc953.

This broke stdenv on Darwin, see #15881. A Darwin user will need to fix
the problem and un-revert. This commit causes CMake to use the same
RPATH settings as the compiler, so it is obviously correct.
2016-05-31 16:30:15 -05:00
Thomas Tuegel
8ec5adc953 cmake: use supplied RPATH instead of guessing 2016-05-31 13:02:10 -05:00
Moritz Ulrich
303aac8381 cargo: 0.9.0 -> 0.10.0, rustRegistry: 2016-05-12 -> 2016-05-28. 2016-05-28 15:05:11 +02:00
Joachim Fasting
4da35b7c56 Merge pull request #15705 from vrthra/redo
redo: Init at 1.2
2016-05-26 10:14:34 +02:00
Bjørn Forsman
25960389da ninja: 1.6.0 -> 1.7.1
Release notes:
https://groups.google.com/forum/#!topic/ninja-build/bkDE7auQwiI/discussion

The current github src URL redirects to the "ninja-build" github user,
so use that directly.
2016-05-26 09:51:10 +02:00
Rahul Gopinath
df40533f11 redo: Init at 1.2
Redo is an alternative for Make. This package is a C++ implementation
of redo.
2016-05-25 13:49:21 -07:00
Bjørn Forsman
2fb4b797a1 meson: add meta.platforms 2016-05-25 21:18:48 +02:00
Bjørn Forsman
a35874b41a meson: fix chroot build
/usr/bin/env is not available in chroot builds. Invoke the python3
interpreter directly instead of trying to let env do it (which fails).

Fixes this build error:

  $ nix-build -A meson
  ...
  /nix/store/HASH-stdenv/setup: ./install_meson.py: /usr/bin/env: bad interpreter: No such file or directory
  builder for ‘/nix/store/HASH-meson-0.26.0.drv’ failed with exit code 126
2016-05-25 21:18:48 +02:00
Nick Novitski
93b99cd361 gnumake: add version 4.2 2016-05-23 15:30:41 +00:00
Tobias Geerinckx-Rice
2964212b45
dub: 0.9.24 -> 0.9.25 2016-05-23 01:31:58 +02:00
Peter Simons
8e462995ba Bring my stdenv.lib.maintainers user name in line with my github nick. 2016-05-16 22:49:55 +02:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
Thomas Tuegel
b70d728ed7 cmake: use single output
Fixes #15184. Install everything, including documentation, into one
output, increasing package size by 10%. Otherwise, the help commands for
CMake do not work. This is a good trade because CMake should be a
build-only dependency. The only reason the docs should ever make it to
runtime is if the user has actually installed CMake, in which case
there's a pretty good chance they want the docs, too.
2016-05-06 16:26:40 -05:00
Tim Steinbach
a17c90dcd1
gradle: 2.12 -> 2.13 2016-05-06 10:52:25 -04:00
Robin Gloster
9820cb1bf2 use dontBuild instead of hacks
changes:
 * buildPhase = "true"
 * buildPhase = ":"
2016-05-04 10:11:04 +00:00
Tuomas Tynkkynen
aadaa91379 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/applications/networking/browsers/vivaldi/default.nix
	pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
Joachim Fasting
e1197f6896 Merge pull request #15082 from namore/init_rake
rake: init at 11.1.1
2016-05-02 03:20:51 +02:00
Nikolay Amiantov
87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Roman Naumann
61c8af996f rake: init at 11.1.1 2016-04-29 15:45:11 +02:00
Tuomas Tynkkynen
4ff8f377af Merge remote-tracking branch 'upstream/master' into staging 2016-04-28 00:13:53 +03:00
Frederik Rietdijk
d5e6a4494a Python: use PyPI mirror (#15001)
* mirrors: add pypi

* Python: Use pypi mirror for all PyPI packages
2016-04-26 13:38:03 +01:00
Joachim Fasting
2dbfe512db Merge pull request #14858 from ericbmerritt/elixir-support
Elixir support
2016-04-25 23:04:14 +02:00
Eric Merritt
cd27abe751 rebar3: refactor
cleanup up the code quite a bit in the bootstrapper
2016-04-25 08:34:55 -07:00
Nikolay Amiantov
96a5c34bc5 cmake2_8: use get(Output) functions 2016-04-25 13:24:40 +03:00
Nikolay Amiantov
5ff40ddedf add get* helper functions and mass-replace manual outputs search with them 2016-04-25 13:24:39 +03:00
Eric Merritt
658a49b81d rebar3: 3.0.0-beta.4 -> 3.1.0 2016-04-23 19:03:30 -07:00
Eric Merritt
383626b9d7 move rebar3-nix-bootstrap to rebar3
This moves rebar3-nix-bootstrap from its own repository to rebar3. Its a
single file and this vastly reduces the complexity of making changes.
2016-04-23 19:03:29 -07:00
Eric Merritt
8dbcb4e35e beamPackages: Add support for Mix and Erlang.mk 2016-04-23 19:03:24 -07:00
Tadas Barzdzius
a49ffbb196 cargo: add libiconv to buildInputs to fix darwin build 2016-04-23 23:08:02 +03:00
Vladimír Čunát
e9379f7416 Merge branch 'staging'
This includes a fix to closure-size regression that moved
share/doc/*/ to share/doc/
2016-04-22 16:49:09 +02:00
Thomas Tuegel
491f7f017c cmake: set LIBDIR and INCLUDEDIR for multiple outputs 2016-04-20 10:01:06 -05:00
Tadas Barzdzius
7d661a4ab4 cargo: 0.8.0 -> 0.9.0. Enable Darwin 2016-04-20 12:42:37 +03:00
Mathieu Boespflug
6c9c59067b gradle: fix attribute name for gcc libs path.
PR #14326 fixed gradle so that its native code library could find
libstdc++.so.6, but this fix is inoperative now, because this library
is in `"${stdenv.cc.cc.lib}/lib"` now, rather than
`"${stdenv.cc.cc}/lib"`.
2016-04-17 01:09:24 +02:00
Nikolay Amiantov
52637e22cd cmake: add all glibc outputs to system prefix 2016-04-14 01:03:23 +03:00
Nikolay Amiantov
d528c7d8f5 cmake-2_8: fix for multiple outputs 2016-04-14 01:03:23 +03:00
Michael Raskin
238cb743bc scons: 2.4.1 -> 2.5.0 2016-04-13 14:47:04 +02:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Tobias Geerinckx-Rice
57ef1712e3
Substite new GitHub username ‘timbertson’ for ‘gfxmonk’ 2016-04-11 16:35:18 +02:00
Tobias Geerinckx-Rice
613cef6240
gup: 0.5.4 -> 0.5.5; use fetchFromGitHub 2016-04-11 16:21:12 +02:00
Vladimír Čunát
30f14243c3 Merge branch 'master' into closure-size
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Aaron Son
bbfad5111a gradle: Fix gradle-2.12 on Linux to find libstdc++.so reference in native library. 2016-04-01 14:33:23 -07:00
Vladimír Čunát
ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Jakob Gillich
a9326f6f34 cargoMaster: 2016-02-25 -> 2016-03-22 2016-03-22 13:16:56 +01:00
Tim Steinbach
aa4af87501 gradle: 2.11 -> 2.12 2016-03-16 18:55:11 +00:00
Vladimír Čunát
09af15654f Merge master into closure-size
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Frederik Rietdijk
36506df7fe Merge pull request #13448 from lancelotsix/use_recent_sqlalchemy_as_default
pythonPackages.sqlalchemy: follows upstream, use "sqlalchemy7" for lecagy
2016-03-05 11:07:50 -05:00
Gabriel Ebner
de24ea40f8 sbt: 0.13.9 -> 0.13.11 2016-03-03 16:09:00 +01:00
Tim Cuthbertson
70df5bf9ea gup: 0.5.3 -> 0.5.4 2016-02-29 20:15:19 +11:00
zimbatm
17348dc094 Remove all dots at end of descriptions
Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
2016-02-27 17:30:29 +00:00
Lancelot SIX
0467a17858 pythonPackages.sqlalchemy: follows upstream, sqlalchemy7 for lecagy
This makes pythonPackages.sqlalchemy the most up to date revision (it
was called sqlalchemy_1_0 before), and maintains the various “legacy”
versions available as pythonPackages.sqlalchemyX for X in {7,8,9}.

All derivations that required `sqlalchemy_1_0` now require `sqlalchemy`
while those that required `sqlalchemy` now require `sqlalchemy7`.

The derivations are not changed, only the attribute names they are
bound to.
2016-02-27 12:11:12 +01:00
Nikolay Amiantov
a4902ff1fa rustUnstable.cargo: 2016-01-10 -> 2016-02-25 2016-02-25 14:21:46 +03:00
Jude Taylor
45ea4956d8 fix library dependencies for cargo on darwin 2016-02-23 16:42:51 -08:00
Frederik Rietdijk
40ca841c5c Merge pull request #13124 from FRidh/buildPythonApplication
buildPythonApplication: use new function for Python applications
2016-02-23 16:02:10 +01:00
Pascal Wittmann
50f45db51c icmake: 8.00.05 -> 8.01.00 2016-02-20 20:28:26 +01:00
Frederik Rietdijk
4d06bf70f4 buildPythonApplication: use new function for Python applications 2016-02-19 13:16:41 +01:00
Eelco Dolstra
8af685d089 Merge pull request #13097 from jerith666/antrun
ant: preserve antRun script
2016-02-18 19:48:12 +01:00
Matt McHenry
e5e633ca11 ant: preserve antRun script 2016-02-18 10:13:39 -05:00
Vladimír Čunát
e9520e81b3 Merge branch 'master' into staging 2016-02-17 10:06:31 +01:00
Herwig Hochleitner
b7b696e534 leiningen: 2.5.3 -> 2.6.1 2016-02-16 22:39:34 +01:00
Vladimír Čunát
d039c87984 Merge branch 'master' into closure-size 2016-02-14 08:33:51 +01:00
Tim Steinbach
e81fd09b85 gradle: 2.10 -> 2.11 2016-02-10 21:48:45 +00:00
tg(x)
310a20eda8 waf 2016-02-10 20:34:05 +01:00
Vladimír Čunát
a115bff08c Merge branch 'master' into staging 2016-02-07 13:52:42 +01:00
Nikolay Amiantov
d9c4fc4de9 Merge pull request #12682 from zohl/nant
NAnt
2016-02-03 22:56:12 +03:00
Al Zohali
9679042278 nant: init at 20151115 2016-02-03 22:00:41 +03:00
Vladimír Čunát
d3a3aa8674 Merge #12740: multiple outputs for Qt 5 and KDE 5 2016-02-03 17:09:09 +01:00
Vladimír Čunát
80270e2019 cmake: maintenance updates 3.4.0 -> 3.4.3 2016-02-03 16:59:38 +01:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Ricardo M. Correia
52475afe77 cargo: 0.7.0 -> 0.8.0 2016-02-02 17:25:44 +01:00
Thomas Tuegel
a714284d8b cmake: don't set incompatible flags for multiple outputs 2016-01-31 21:15:03 -06:00
Thomas Tuegel
1087020a46 cmake: invoke configure hooks correctly
Otherwise, the multiple-outputs hooks will not fire correctly.
2016-01-31 21:15:03 -06:00
Tobias Geerinckx-Rice
ac33b4724a More version attribute tidying where maintainers |= nckx 2016-01-25 20:08:34 +01:00
Tuomas Tynkkynen
ed7dbb46a8 treewide: Mass replace 'zlib}/lib' to refer the 'out' output 2016-01-24 10:03:39 +02:00
Tim Cuthbertson
b82d5ef857 gup: 0.5.1 -> 0.5.3 2016-01-24 16:34:07 +11:00
Tobias Geerinckx-Rice
32d40f0f98 Remove no longer (or never) referenced patches
55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
2016-01-24 02:02:21 +01:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Eric Merritt
8021b5241c rebar3: refactor to make hermetic
This adds changes to the rebar3 expression that patch rebar3 to force it
to be hermetic. Now, by default, rebar3 literally can't download
anything. A 'rebar3-open' expression was added for those folks whe want
the normal rebar3.
2016-01-18 08:19:15 -08:00
Vladimír Čunát
620c147cce Merge branch 'master' into staging 2016-01-18 09:48:49 +01:00
Gleb Peregud
ed4373e8b7 Pass buildPlugins to rebar3-nix-bootstrap.
To successfully build rebar packages, it needs to be provided with
rebar3 plugins used to build it. This change passes them to env
variable. From there rebar3-nix-bootstrap takes them and symlinks into
_build/default/plugins.
2016-01-17 21:59:27 +01:00
Eric Merritt
24a9dcd12f rebar3: refactor
Move registrySnapshot to the erlang-nix github organization
2016-01-15 09:07:06 -08:00
Vladimír Čunát
2d0893088f Merge branch 'master' into staging 2016-01-15 13:43:57 +01:00
Eric Merritt
474e417891 erlang support: allow nix-shell to work correctly
This changes build-hex.nix so that the buildHex and related functions
work correctly in a nix-shell.
2016-01-14 14:36:47 -08:00
Nikolay Amiantov
d1ed30ac0d cargoUnstable: init at 2016-01-10 2016-01-13 13:48:24 +03:00
Pascal Wittmann
1d947ed4bf icmake: 7.23.02 -> 8.00.05 2016-01-09 20:07:43 +01:00
Jude Taylor
08c081309b Revert "gnustep-make: fix installation path"
This reverts commit 4f1559a751.
2016-01-07 21:52:11 -08:00
Peter Simons
1355e928cf Merge pull request #12148 from ragnard/boot-update-and-remove-make-wrapper-usage
boot: Update shell script version and remove makeWrapper usage
2016-01-05 12:22:23 +01:00
Eric Seidel
222f4b9e2b gnustep-make: dont write to /Library/GNUstep 2016-01-04 14:07:17 -08:00
Ragnar Dahlén
a25bfab690 boot: Update shell script version and remove makeWrapper usage 2016-01-04 17:23:45 +00:00
Tobias Geerinckx-Rice
ddd48258e8 gnustep-make: 2.6.6 -> 2.6.7 2016-01-03 00:24:28 +01:00
Tobias Geerinckx-Rice
4f1559a751 gnustep-make: fix installation path
Get rid of the nested /nix/store/.../nix/store/... directories.
2016-01-03 00:24:28 +01:00
Michael Raskin
1dba4b4e6a scons: 2.3.6 -> 2.4.1 2016-01-01 12:30:17 +03:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robin Gloster
2faea53f8e cargo: 0.6.0 -> 0.7.0 2015-12-24 13:20:24 +01:00
Tim Steinbach
d509f8a30a gradle: 2.9 -> 2.10 2015-12-23 08:44:49 -05:00
Tim Steinbach
895875bdac maven: 3.3.3 -> 3.3.9, fixes #11867 2015-12-22 02:11:00 +01:00
Tim Steinbach
9121277144 gradle: 2.8 -> 2.9 2015-12-21 11:37:21 -05:00
Herwig Hochleitner
b3b7f9f37f fix lib path for gradle, fixes #11191 2015-12-18 23:12:43 +03:00
Gleb Peregud
bb1b5c7194 Update hex.pm registry 2015-12-15 15:06:47 +01:00
Gleb Peregud
474da3bf24 Add sources of specific rebar bootstrap deps via new fetchHex
derivation.
2015-12-15 15:06:44 +01:00
Gleb Peregud
108f3cf67f Add patch which makes rebar compilation hermetic 2015-12-15 14:05:51 +01:00
Gleb Peregud
4ba1a51b7f Move registry to rebar3, since it needs it itself to be bootstrapped.
This makes rebar3 build a bit more hermetic. Next stage is to pull in
rebar3 plugins dependencies for bootstrap to pick up.
2015-12-15 14:05:19 +01:00
Gleb Peregud
033902d269 Refactor fetchHex out of buildHex.
This will allow to reuse this code to fetch rebar3's dependencies to
ensure it's hermetic build.
2015-12-15 14:01:38 +01:00
Gleb Peregud
bcc4ca029a Add rebar3 package 2015-12-15 01:02:52 +01:00
Luca Bruno
5b0352a6a4 Merge branch 'master' into closure-size 2015-12-11 18:31:00 +01:00
Herwig Hochleitner
58ba1d5bd3 leiningen: 2.5.2 -> 2.5.3, fixes #11537 2015-12-08 02:58:33 +01:00
Luca Bruno
e289717414 rename moveToOutput and propagatedBuildInputs 2015-12-02 10:05:36 +01:00
Luca Bruno
920b1d3591 Merge branch 'master' into closure-size 2015-11-29 16:50:26 +01:00
Vladimír Čunát
f2ad4a47e8 cmake: remove conditional patch that no longer applies
Close #11290. The patch will no longer apply on *any* platform.
2015-11-29 08:58:39 +01:00
Domen Kožar
67e03d0c50 Merge branch 'buildPythonPackage+wheels' 2015-11-26 17:38:35 +01:00
Luca Bruno
a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Joachim Fasting
6ccf87defe bam: reimplement using mkDerivation 2015-11-24 14:45:15 +01:00
Mikhail Volkhov
bc05b570e6 gradle: refactor 2015-11-22 12:46:10 +03:00
Domen Kožar
704c8bab41 buildPythonPackage: fix standalone applications using it 2015-11-21 21:44:12 +01:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Danny Wilson
1ebc5bfa21 boot: 2.2.0 -> 2.4.2 2015-11-18 11:48:04 +01:00
Ricardo M. Correia
2b694c237b cargo, cargoSnapshot: add rustc runtime dependency
It turns out that cargo implicitly depends on rustc at runtime: even
`cargo help` will fail if rustc is not in the PATH.

This means that we need to wrap the cargo binary to add rustc to PATH.
However, I have opted into doing something slightly unusual: instead of
tying down a specific cargo to use a specific rustc (i.e., wrap cargo so
that "${rustc}/bin" is prefixed into PATH), instead I'm adding the rustc
used to build cargo as a fallback rust compiler (i.e., wrap cargo so
that "${rustc}/bin" is suffixed into PATH). This means that cargo will
prefer to use a rust compiler that is in the default path, but fallback
into the one used to build cargo only if there wasn't any rust compiler
in the default path.

The reason I'm doing this is that otherwise it could cause unexpected
effects. For example, if you had a build environment with the
rustcMaster and cargo derivations, you would expect cargo to use
rustcMaster to compile your project (since rustcMaster would be the only
compiler available in $PATH), but this wouldn't happen if we tied down
cargo to use the rustc that was used to compile it (because the default
cargo derivation gets compiled with the stable rust compiler).

That said, I have slightly modified makeRustPlatform so that a rust
platform will always use the rust compiler that was used to build cargo,
because this prevents mistakenly depending on two different versions of
the rust compiler (stable and unstable) in the same rust platform,
something which is usually undesirable.

Fixes #11053
2015-11-18 02:41:45 +01:00
William A. Kennington III
050bebb8c4 cmake: 3.3.2 -> 3.4.0 2015-11-13 15:55:44 -08:00
Desmond O. Chang
b9c11de2a8 gradle: 2.6 -> 2.8 2015-11-11 16:45:19 +08:00
Edward Tjörnhammar
38ca909811 maven: 3.2.5 -> 3.3.3 2015-11-10 08:46:14 +01:00
Aristid Breitkreuz
c35e349409 rename make->gnustep-make to avoid people installing it accidentally 2015-11-07 16:08:17 +01:00
Pascal Wittmann
fcb4627695 Merge pull request #9980 from wavewave/gradle25
add gradle 2.5.
2015-11-06 17:17:28 +01:00
Ian-Woo Kim
3d5f95d61b gradle: reinit at 2.5.
For some projects (especially using android ndk), we still need to keep 2.5.
2015-11-06 07:31:58 -08:00
Ricardo M. Correia
84afac6b89 cargo: 0.5.0 -> 0.6.0 2015-11-03 20:32:12 +01:00
Pascal Wittmann
36a529e566 icmake: 7.22.01 -> 7.23.02 2015-10-28 17:43:41 +01:00
Vladimír Čunát
1d921ad3a7 cmake-2.8: fix build with multiple outputs 2015-10-28 13:30:50 +01:00
Cillian de Róiste
e42e4cfbd9 Meson: tidy up, untabify 2015-10-24 12:50:15 +02:00
Brandon Edens
6774b09af7 Add meson build system package. 2015-10-21 09:08:48 -07:00
Edward Tjörnhammar
c10caef1a2 Merge pull request #10062 from gebner/sbt-loader-package
sbt: use sbt-launcher-package.
2015-10-12 23:02:58 +02:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Gabriel Ebner
98be4ed5e8 sbt: use sbt-launcher-package. 2015-09-25 16:54:35 +02:00
William A. Kennington III
d5395b0506 Merge pull request #10024 from mayflower/update-rust
Update rust and dependants
2015-09-23 22:43:25 -07:00
William A. Kennington III
5cfe893cc4 Merge commit '2d464f75ed46869b5942c4b479772a0367b30608' into master.upstream
This is a partial commit from staging in an attempt to make merges
smaller.
2015-09-23 14:35:36 -07:00
Robin Gloster
feda2925f7 cargo: 0.3.0 -> 0.5.0 2015-09-23 21:16:16 +00:00
Tobias Geerinckx-Rice
ee7df6a566 dub: 0.9.23 -> 0.9.24
Use fetchFromGitHub, and drop a seemingly spurious 'unzip' dependency
(I can find no reference to it in either the source or the resulting
binary).
2015-09-21 19:22:14 +02:00
William A. Kennington III
5ba050a1a3 cmake: 3.3.1 -> 3.3.2 2015-09-20 14:08:22 -07:00
goibhniu
529fad3fcf Merge pull request #9691 from samuelrivas/update-argyllcms
Update argyllcms
2015-09-14 10:01:36 +02:00
Tim Cuthbertson
9dfef9ff26 gup: init at version 0.5.1 2015-09-08 20:45:20 +10:00
Samuel Rivas
4ef2d19981 jam: add yacc as build input
I am not sure why do I need this locally, it seems to be passing in hydra
anyway...
2015-09-07 11:37:18 +02:00
Peter Simons
fcb0bdbaa0 Merge pull request #9639 from k0ral/scons
scons: 2.3.5 -> 2.3.6
2015-09-03 21:08:32 +02:00
koral
bfe09b88fc scons: 2.3.5 -> 2.3.6 2015-09-03 17:37:56 +00:00
Eelco Dolstra
6cadec8906 ant: Update to 1.9.6 2015-09-01 12:00:04 +02:00
Tobias Geerinckx-Rice
687d60ec73 icmake: Sourceforge -> (fetchFrom)GitHub
Also add myself as a maintainer.

CC@ pSub
2015-09-01 05:28:53 +02:00
Thomas Tuegel
90a72bd177 Merge branch 'master' into staging 2015-08-23 10:29:12 -05:00