Commit Graph

20 Commits

Author SHA1 Message Date
obadz
0e8d2725dc Merge branch 'master' into staging 2016-08-23 18:50:06 +01:00
Damien Cassou
11b45b3712 emacs25pre: rc1 -> rc2 2016-08-23 10:41:13 +02:00
Robin Gloster
b7787d932e Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-08-12 09:46:53 +00:00
Damien Cassou
882ad3bbd0 emacs25pre: Removes doCheck = false
Fixes #13573. This package builds fine without this line now.
2016-08-07 09:04:31 +02:00
Robin Gloster
63c7b4f9a7 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-31 20:51:34 +00:00
Damien Cassou
6a41c312eb emacs25pre: 25.0.95 -> 25.1-rc1 2016-07-27 14:24:17 +02:00
Robin Gloster
203846b9de Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-19 10:37:02 +00:00
Robin Gloster
5185bc1773 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-07-15 14:41:01 +00:00
Alexey Lebedeff
9edcfa8908 emacs25pre: Fix https for xwidgets-browse-url 2016-07-15 17:16:24 +03:00
Alexey Lebedeff
658c2de1b7 emacs25pre: Add option for building with xwidgets 2016-07-15 16:18:23 +03:00
Joachim Fasting
72d589080f
emacs25pre: 25.0.94 -> 25.0.95 2016-06-11 21:59:53 +02:00
Robin Gloster
2d382f3d98 Merge remote-tracking branch 'upstream/master' into hardened-stdenv 2016-05-30 19:39:34 +00:00
Robin Gloster
eb6809eafd emacs25pre: disable format hardening 2016-05-30 19:34:16 +00:00
Vladimír Čunát
c4661e9643 Merge: make dev output references explicit
This is a rebase of most commits from #14766,
resolving conflicts and a few other evaluation problems.
2016-05-22 12:09:23 +02:00
Tuomas Tynkkynen
5e5c5382f6 treewide: Make explicit that 'dev' output of cairo is used 2016-05-19 10:00:28 +02:00
Joachim Fasting
013fd785a1
emacs25pre: 25.0.93 -> 25.0.94 2016-05-18 03:54:17 +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
Nicolas Petton
693942b61a
emacs25pre: 25.0.92 -> 25.0.93
joachifm: also update the name & re-use it in the url
2016-04-24 23:27:16 +02:00
Damien Cassou
9b52caaa0c emacs25pre: 25.0.50-1b5630e -> 25.0.92 2016-04-05 09:57:05 +02:00
John Wiegley
59213cc1da emacs25pre: New expression, from emacs-25 pre-release branch 2015-12-16 15:13:16 -08:00