Commit graph

66 commits

Author SHA1 Message Date
Vladimír Čunát dbae4f109f Merge branch 'master' into staging
Conflicts (relatively simple):
	pkgs/applications/audio/spotify/default.nix
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/compilers/cryptol/1.8.x.nix
2015-01-31 19:34:57 +01:00
Thomas Tuegel 3d919a002d zotero: build standalone from cross-platform XPI with latest firefox 2015-01-24 13:42:19 -06:00
Eric Seidel f3c6827373 rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc 2015-01-14 20:27:55 -08:00
Shea Levy 05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
John Wiegley 28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Thomas Tuegel 23b387236d zotero: use firefox instead of xulrunner to fix i686 build 2014-12-14 13:49:34 -06:00
Thomas Tuegel 5c9de38488 zotero: use private firefox and xulrunner
Zotero breaks every time firefox is updated (about every six weeks). It
is always fixed with the next zotero update, but that can take weeks.
Sometimes, upstream even skips firefox releases. This will stop zotero
breaking every time.
2014-12-04 09:40:57 -06:00
Domen Kožar 20a7c54c87 zotero: upgrade to fix xulrunner compatibility 2014-10-22 20:51:10 +02:00
Thomas Tuegel ad83a961ae zotero: update to 4.0.22
Drop firefox-30.0, which we were only keeping around for
xulrunner-30.0. New Zotero version is compatible up to firefox-32.0.
2014-09-04 11:52:24 -05:00
Vladimír Čunát 05b4882255 zotero: add check to detect xul version breakages 2014-08-15 02:03:52 +02:00
Vladimír Čunát 36a9fb094f merge #3462: zotero update and resurrect xulrunner 2014-08-15 01:55:56 +02:00
Thomas Tuegel 77c99b10fc zotero: version bump 4.0.21.1 -> 4.0.21.2 2014-08-04 05:56:58 -05:00
Eelco Dolstra 40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Thomas Tuegel e07fde4017 Update zotero 4.0.20 -> 4.0.21.1 2014-06-20 08:00:06 -05:00
Thomas Tuegel 3a9917bf18 zotero: version bump 4.0.19 -> 4.0.20 (close #2581) 2014-05-08 22:31:56 +02:00
Thomas Tuegel 5554d9c688 Add zotero 4.0.19 (close #2043)
@vcunat simplied the expression a little.
2014-03-27 22:42:47 +01:00