Commit graph

1474 commits

Author SHA1 Message Date
Vladimír Čunát
6c2fbfbd77 Merge branch 'master' into staging 2016-05-12 04:53:38 +02:00
Eelco Dolstra
86c45ba50d google-talk-plugin: 5.4.2.0 -> 5.41.0.0 2016-05-11 20:18:30 +02:00
Kranium Gikos Mendoza
a36f721630 bluejeans: 2.125.24.5 -> 2.155.17.5 2016-05-11 21:47:12 +08:00
Eelco Dolstra
cb37ab146b Add mirror://mozilla scheme 2016-05-09 19:37:22 +02:00
Eelco Dolstra
de22402f85 firefox-esr: 45.0.2 -> 45.1.1 2016-05-09 15:28:13 +02:00
Eelco Dolstra
02d01dc7c5 firefox: 46.0 -> 46.0.1 2016-05-09 15:27:06 +02:00
Vladimír Čunát
65a9fa8cdc Merge branch 'master' into staging 2016-05-08 21:24:48 +02:00
taku0
07a83f226e firefox-bin: fixed missing icon 2016-05-08 17:06:08 +09:00
Wei Tang
4d15758984 firefox: Fix build due to commit #ab0a0c 2016-05-08 05:58:02 +02:00
Vladimír Čunát
1dc36904d8 Merge #14920: windows improvements, mainly mingw 2016-05-05 08:30:19 +02:00
aszlig
3f7735fe65
chromium+chrome: Don't import update.nix directly
Regression introduced by f28b71023c.

Let's now expose and use the upstream-info attribute via the main
Chromium derivation, so that other packages like the google-chrome
package doesn't need to rely on internals of the Chromium
implementation.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-04 23:12:33 +02:00
aszlig
f28b71023c
chromium/updater: Don't import <nixpkgs> again
This effectively resets the attributes given at the point the main
<nixpkgs> is imported and thus for example is also reading in stuff like
~/.nixpkgs/config.nix again, which might lead to unexpected results.

We now only import <nixpkgs> now if the updater is auto-called (like in
update.sh), otherwise the required attributes are passed by callPackage
within the Chromium scope.

I remember noting about this a while ago either on IRC or on GitHub, but
I can't find it right now, so thanks to @obadz for reminding me about
this in #15225.

Tested this by running the updater and also using:

NIXPKGS_CONFIG=$(pwd)/broken.nix nix-instantiate --arg config {} -A chromium

The contents of broken.nix were:

EVALERR{

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #15225
2016-05-04 22:35:24 +02:00
Arseniy Seroka
9cb8abe846 Merge pull request #15208 from taku0/firefox-bin-46.0.1
firefox-bin: 45.0.2 -> 46.0.1
2016-05-04 21:38:47 +03:00
Eelco Dolstra
1f84e43239 Do some large, concurrency-capable builds on dedicated machines 2016-05-04 18:16:27 +02:00
Eelco Dolstra
f2d24b9840 chromium: Disable Hydra builds of -dev and -beta
It's not the job of Nixpkgs to distribute beta versions of upstream
packages. More importantly, building these delays channel updates by
several hours, which is bad for our security fix turnaround time.
2016-05-04 18:16:27 +02:00
taku0
90f5be3133 firefox-bin: 45.0.2 -> 46.0.1 2016-05-04 14:50:17 +09: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
Nikolay Amiantov
3a52c5fa7d firefox: fix library path
Fixes #15126
2016-05-01 12:26:39 +03:00
Nikolay Amiantov
87ebab128a replace ${stdenv.cc.cc}/lib occurences 2016-05-01 00:13:23 +03:00
Tim Steinbach
1142b402a8 vivaldi: Clean up 2016-04-29 01:19:15 +00:00
Tim Steinbach
25290a9f15 vivaldi: 1.0 -> 1.1 2016-04-28 23:54:05 +00:00
Eelco Dolstra
930d243ea4 firefox: 45.0.2 -> 46.0
Still using GTK+ 2 for now, since apparently building with GTK+ 3
still requires GTK+ 2, increasing the closure size. (#15008)
2016-04-28 13:39:12 +02:00
Arseniy Seroka
52b64cedec Merge pull request #15016 from jagajaga/eid
open-eid
2016-04-28 13:56:09 +03:00
Arseniy Seroka
f6d7cefa7b
esteidfirefoxplugin: init at 3.12.1.1142 2016-04-27 11:38:09 +03:00
Nikolay Amiantov
ab0a0c004e makeSearchPathOutputs: refactor to makeSearchPathOutput 2016-04-25 13:24:39 +03:00
Nikolay Amiantov
bab152826f arora: move to qmake4Hook 2016-04-20 18:55:45 +03:00
Gabriel Ebner
4003d16d66 qutebrowser: 0.6.0 -> 0.6.1 2016-04-17 15:38:12 +02:00
Pascal Wittmann
ea4f08a919 Merge pull request #14742 from mbakke/dwb
dwb: 2015-07-07 -> 2016-03-21
2016-04-15 23:12:31 +02:00
Marius Bakke
2500945b31 dwb: 2015-07-07 -> 2016-03-21 2016-04-15 21:26:17 +01:00
Moritz Ulrich
6645ae3946 google-chrome: Also add ${deps}/lib64 to $LD_LIBRARY_PATH.
...as per @abbradar's suggestion. Thanks!
2016-04-14 19:00:15 +02:00
Moritz Ulrich
0c5ed43cd4 google-chrome: Fix regression from closure-size merge.
Fixes #14695

I'm not entirely sure if including `stdenv.cc.cc` in `makeLibraryPath`
is the correct thing to do here. If it's incorrect, please feel free to
ping me.
2016-04-14 18:54:48 +02:00
Nikolay Amiantov
8b7ebaffeb replace makeSearchPath tree-wise to take care of possible multiple outputs 2016-04-13 22:09:41 +03:00
Michael Raskin
f99a9c0679 nspluginwrapper: add missing libXt build input 2016-04-13 19:10:42 +02:00
Eelco Dolstra
18a6403c59 firefox-esr: 45.0.1esr -> 45.0.2esr
Also, switch to upstream SHA-512 hashes.
2016-04-13 14:11:18 +02:00
Nikolay Amiantov
5e025bc9ee vivaldi: fix evaluation 2016-04-13 14:03:41 +03:00
Vladimír Čunát
39ebb01d6e Merge branch 'staging', containing closure-size #7701 2016-04-13 09:25:28 +02:00
Franz Pletz
84edf81d71 firefox: 45.0.1 -> 45.0.2 2016-04-12 15:48:13 +02:00
taku0
c98cca3614 firefox-bin: 45.0.1 -> 45.0.2 (#14626) 2016-04-12 15:47:31 +02:00
Arseniy Seroka
e02debe165 Merge pull request #14291 from otwieracz/vivaldi
vivaldi-snapshot: init at 1.0.430.3
2016-04-12 08:52:37 +03: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
Nikolay Amiantov
d45ac41e87 flashplayer: cleanup, add comment to maintainers 2016-04-08 17:18:54 +03:00
taku0
28232c3746 flashplayer: fix build on 32-bit platform 2016-04-08 16:55:51 +03:00
taku0
03e74fb117 flashplayer: 11.2.202.577 -> 11.2.202.616 2016-04-08 22:11:29 +09:00
Gabriel Ebner
ab58c22d6a Merge pull request #14528 from kragniz/qutebrowser-0.6.0
qutebrowser: 0.5.1 -> 0.6.0
2016-04-08 07:09:10 +02:00
Louis Taylor
21c78411da qutebrowser: 0.5.1 -> 0.6.0 2016-04-08 05:59:05 +01:00
Vladimír Čunát
d1df28f8e5 Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Slawomir Gonet
c6345de9f9 vivaldi: init at 1.0 2016-04-07 08:05:53 +02:00
Markus Wotringer
90624dcf89 conkeror: 1.0pre-20150730 -> 1.0pre-20160130 2016-04-05 14:34:42 +02:00
Eelco Dolstra
2f0195003e firefox-esr: Fix name
The Firefox wrapped called itself "firefox" rather than "firefox-esr".

Also eliminate a use of splitString which is evil and should never be
used.
2016-04-01 13:51:24 +02: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