Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
Nikolay Amiantov
ac3ce1c26a
bumblebee: fix outputs
2016-05-01 03:27:27 +03:00
David Guibert
8601f69072
xpra: 0.16.2 -> 0.17.0
2016-04-24 21:51:39 +02:00
Nathan Zadoks
ed6943ecbc
virtualgl: fix libturbojpeg library path
...
Without this, it tries to link to the dev output of libjpeg_turbo, which
breaks the build.
2016-04-24 13:25:57 -04:00
Tuomas Tynkkynen
bd18cc3cdc
Merge pull request #14888 from dezgeg/pr-kill-module-init-tools
...
Delete all usages of module_init_tools and remove the package
2016-04-23 14:29:41 +03:00
Tuomas Tynkkynen
01854a850a
treewide: Replace module_init_tools -> kmod
...
The former is deprecated and doesn't handle compressed kernel modules,
so all current usages of it are broken.
2016-04-22 10:40:57 +03:00
Hurshal Patel
9023722e77
xbanish: init at 1.4 👻
2016-04-19 23:33:38 -07:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Nikolay Amiantov
8b7ebaffeb
replace makeSearchPath tree-wise to take care of possible multiple outputs
2016-04-13 22:09:41 +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
Robin Gloster
696d85a62d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-03 11:01:57 +00: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
Nikolay Amiantov
9b7edbeb2f
primus: propagate stdenv to primusLibs
2016-03-31 19:52:33 +03:00
Robin Gloster
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00:00
zimbatm
621ed35991
xdg_utils: fixes #14060
2016-03-20 00:52:10 +00:00
zimbatm
af1e32acd3
xdg_utils: 1.1.0-rc3p46 -> 1.1.1
2016-03-20 00:52:09 +00:00
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
Vladimír Čunát
1df2a6431f
xdg-utils: replace commands more precisely
...
Fix #13904 , close #13908 .
Previously many messages got clobbered. Now it should be better.
The solution is still relatively hacky, but I don't see how to improve
it without doing lots of work.
2016-03-14 11:00:05 +01:00
Domen Kožar
4471f144df
Merge pull request #13810 from ts468/upstream.xpra
...
xpra: 0.14.19/0.15.3 -> 0.16.2
2016-03-10 12:35:04 +00:00
Thomas Strobel
83b15e2fc4
xpra: 0.14.19/0.15.3 -> 0.16.2
2016-03-10 12:06:55 +01: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
Franz Pletz
cb3d27df93
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
Nikolay Amiantov
2a7f56bc8f
virtualgl: 2.4.1 -> 2.5
2016-03-04 14:46:45 +03:00
Robin Gloster
fed49425c5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-03 16:11:55 +00:00
José Romildo Malaquias
6cf907ba09
xsettingsd: 0.0.1 -> git-2015-06-14
2016-03-03 11:58:55 -03:00
Robin Gloster
3477e662e6
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-27 00:08:08 +00:00
Robin Gloster
21b1e9e3da
xbindkeys-config: disable format hardening
2016-02-24 16:00:25 +00: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
Robin Gloster
bc21db3692
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-19 21:16:14 +00:00
Robin Gloster
92e7adef40
sct: fix hash
2016-02-19 21:15:59 +00:00
Arseniy Seroka
a2a5d234a5
Merge pull request #13101 from zimbatm/dispad
...
dispad: init at 0.3.1
2016-02-19 22:52:45 +03:00
Frederik Rietdijk
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
zimbatm
cb10518806
dispad: init at 0.3.1
2016-02-18 17:14:17 +00:00
Vladimír Čunát
d039c87984
Merge branch 'master' into closure-size
2016-02-14 08:33:51 +01:00
Profpatsch
a708bce08b
screen-message: add git mirror (darcs fails)
...
in response to #12868
2016-02-07 23:46:42 +01:00
Tuomas Tynkkynen
0b971a8134
ckbcomp: Builds on Darwin
2016-02-03 04:46:09 +02:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Domen Kožar
9e8eba48ab
xorg.xorgserver: wrap Xvfb with required flags
2016-01-17 21:14:49 +01:00
noctuid
db25c680c9
setroot: init at 1.4.4
2016-01-06 15:35:09 -05: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
Michael Raskin
154e88ab3f
xprintidel-ng: init at git-2015-09-01
2015-12-12 11:47:18 +01:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Nikolay Amiantov
67c109efe5
bumblebee: use postPatch instead of patchPhase
2015-12-09 21:04:34 +03:00
Frederik Rietdijk
9cc4bb7f4c
xpra: use pillow instead of pil
2015-12-08 15:15:41 +01:00
Nikolay Amiantov
c990a1ed4d
Merge pull request #11262 from spwhitt/bumblebee_have
...
bumblebee: use _have not have in bash completion
2015-12-05 00:56:16 +03:00
Nikolay Amiantov
95629cf6f8
bumblebee: cleanup, fix virtualgl, add useNvidia flag
2015-12-05 00:54:09 +03:00
Nikolay Amiantov
3b1ab88428
virtualgl: 2.3.2 -> 2.4.1, fix multilib
2015-12-05 00:54:09 +03:00
Nikolay Amiantov
56ffc2ecd2
primus: 1.0.0748176 -> 20151204, add useNvidia flag
2015-12-05 00:54:09 +03:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00