Commit graph

317 commits

Author SHA1 Message Date
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
Luca Bruno a412927924 Merge remote-tracking branch 'origin/master' into closure-size 2015-11-25 21:37:30 +01:00
Spencer Whitt 28d2ac416e bumblebee: use _have not have in bash completion
Fixes #10936
2015-11-25 10:42:21 -05: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
Michael Raskin 05129a3ee6 Add sct — a minimal utility to set display colour temperature 2015-11-17 01:50:09 +03:00
Benno Fünfstück c7adb3d327 xvkbd: update from 3.6 to 3.7 2015-11-01 13:04:53 +01:00
Stéphane Jourdois a39832a12c xdg-utils: allow build on darwin 2015-10-31 17:58:23 +01:00
William Casarin a2f8585c39 dragon-drop: init at git-2014-08-14 2015-10-30 11:17:22 -07:00
Tuomas Tynkkynen db81e22148 treewide: Mass-replace 'xorgserver}/bin' with correct output
vcunat added one fix in xdummy.
2015-10-28 10:17:12 +01:00
Josef Svenningsson 64b972acb9 Fix spelling mistakes
homepahe -> homepage
2015-10-27 11:49:48 +01:00
Tuomas Tynkkynen a4e417d428 ckbcomp: 1.131 -> 1.133 2015-10-25 02:22:09 +03:00
Igor Sharonov 7a692670e3 numlockx: init at 1.2 2015-10-16 20:19:19 +03:00
Mariusz `shd` Gliwiński eebbf15da9 dex: init at 0.7 2015-10-15 13:58:52 +02:00
Matthias Beyer bebfc6ad82 wmutils-core: 1.0 -> 1.1 2015-09-29 12:25:38 +02:00
Vladimír Čunát 76ef7a93e3 Merge: xlibs and x11 attribute cleanup
Frequently using multiple *almost* identical attributes is bad.
2015-09-23 10:42:34 +02:00
Matthias Beyer 49b49a0172 arandr: 0.1.7.1 -> 0.1.8 2015-09-22 01:49:38 +02:00
Vladimír Čunát aaa985e317 xgd-utils: update p7 -> p46 (close #9851)
This update probably contains a fix for CVE-2014-9622.
Thanks to @jb55 for the PR. We take even newer version.
2015-09-20 09:43:29 +02:00
Vladimír Čunát 88c9f8b574 xlibs: replace occurrences by xorg
This seems to have been confusing people, using both xlibs and xorg, etc.
- Avoided renaming local (and different) xlibs binding in gcc*.
- Fixed cases where both xorg and xlibs were used.
Hopefully everything still works as before.
2015-09-15 12:54:34 +02:00
Vladimír Čunát 21e3ff658a x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs
before this set of refactoring. But that config wasn't even used by
default.
2015-09-15 12:08:24 +02:00
Gabriel Ebner a395ceed40 keynav: 0.20110708.0 -> 0.20150730.0 2015-09-13 08:16:42 +02:00
Gabriel Ebner 50b1ca6dcc xdotool: 2.20110530.1 -> 3.20150503.1 2015-09-12 13:18:31 +02:00
Pascal Wittmann b493688c69 bgs: update from 0.7.1 to 0.8 2015-09-05 11:20:28 +02:00
William A. Kennington III 2138f789bc Merge branch 'master.upstream' into staging.upstream 2015-08-20 10:32:29 -07:00
Benno Fünfstück 1f10b44d3e xvkbd: update from 3.5 to 3.6 2015-08-20 17:07:19 +02:00
Jan Malakhovski a0f50dc665 xdg_utils: add mimi support 2015-08-16 20:23:01 +02:00
Thomas Strobel 50a5845855 xpra: fix rencode dependency 2015-08-10 23:14:29 +02:00
ts468 8958841d39 Merge pull request #9185 from akaWolf/xpra
xpra: 0.14.19 -> 0.15.3
2015-08-10 22:31:18 +02:00
Artjom Vejsel fa2ee81a92 xpra: 0.14.19 -> 0.15.3 2015-08-09 20:58:39 +03:00
Pascal Wittmann f104a6c008 Merge pull request #9145 from dezgeg/pr-ckbcomp-update
ckbcomp: 1.129 -> 1.131
2015-08-06 16:21:15 +02:00
Tuomas Tynkkynen 1bbcaf2eaf ckbcomp: 1.129 -> 1.131
Based on upstream commit logs; not much has happened: mostly translation
updates and a minor fix for Nokia N900 keyboards.
2015-08-06 16:51:42 +03:00
Eelco Dolstra 48efe637ac xdg-utils: Don't depend on "which" 2015-07-26 22:46:23 +02:00
Oliver Hunt a855efe7db ksuperkey: init 2015-07-21 21:37:29 +00:00
William A. Kennington III d605663ae2 Merge branch 'master.upstream' into staging.upstream 2015-07-05 13:06:02 -07:00
aszlig 2467c437b7
xdg_utils: Fix wrong substitution of grep command.
Fixes regression introduced by 16406e63b3.

Not replacing "egrep" with a negated character class on [^e] needs to be
put back into the replacement, because if we have something like:

foo="$(grep xxx)"

The replacement would be something like this:

foo="$/nix/store/.../bin/grep xxx)"

Which will lead to wrong behavior and in cases of for example
"xdg-screensaver", even directly to a syntax error:

xdg-screensaver: line 178: syntax error near unexpected token `('
xdg-screensaver: line 178: `command="/nix/store/.../bin/grep -E
                            "^Exec(\[[^]=]*])?=" "$file" |
                            /nix/store/.../bin/cut -d= -f 2- |
                            first_word`"'

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-07-05 09:25:13 +02:00
William A. Kennington III 612f0bdd67 Merge branch 'master.upstream' into staging.upstream 2015-06-30 23:58:07 -07:00
Pascal Wittmann 16406e63b3 xdg_utils: fix handling of runtime dependencies, closes #8564
'egrep' was substituted with the path to the grep binary
2015-06-30 15:45:09 +02:00
William A. Kennington III 282d03befa Merge branch 'master.upstream' into staging.upstream 2015-06-22 10:57:36 -07:00
Tuomas Tynkkynen 4ac3bc3330 ckbcomp: init at 1.129 2015-06-22 15:32:42 +03:00
Vladimír Čunát 61596bf405 Merge #8363: pure-darwin stdenv 2015-06-18 22:38:08 +02:00
lethalman e5f9ffbb99 Merge pull request #8267 from hiberno/bump-xcape
xcape: bump to latest revision
2015-06-18 14:46:06 +02:00
Rok Garbas ca407f3738 xdg_utils: fixing some of the impurities in xdg-utilso, #8377 2015-06-18 10:51:35 +02:00
Luca Bruno aa800fa0fe Merge branch 'master' into staging 2015-06-15 09:56:29 +02:00
Michael Raskin d9354c6a2a Add xwinmosaic window switcher 2015-06-14 23:26:58 +03:00
Michael Raskin 649b0affe1 Adding Skippy-XD window switcher 2015-06-14 23:26:58 +03:00
Michael Raskin a6d54b3fdd A comment about the license 2015-06-14 23:26:58 +03:00
Michael Raskin 14695867cb Add ratmen X11 menu generator 2015-06-14 23:26:58 +03:00
Eelco Dolstra 4970574409 Merge remote-tracking branch 'origin/gcc-4.9' into staging
Conflicts:
	pkgs/development/libraries/wayland/default.nix
2015-06-11 00:23:03 +02:00
hiberno 429461c3e2 xcape: bump to latest revision 2015-06-10 14:37:49 +02:00
Clemens Fruhwirth 1db87a34e9 Add xsettingsd. 2015-06-04 09:16:05 +00:00
Eelco Dolstra 553abf71ba Merge remote-tracking branch 'origin/staging' into gcc-4.9
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/development/libraries/wayland/default.nix
	pkgs/development/tools/build-managers/cmake/default.nix
	pkgs/top-level/all-packages.nix
2015-06-01 20:08:43 +02:00
Pascal Wittmann bb9e9cc3f8 Turned some meta.maintainers into lists 2015-05-14 19:09:43 +02:00
Eelco Dolstra 94389cb8c6 xdg-utils, libclc: Use fetchzip 2015-05-13 18:17:26 +02:00
Pascal Wittmann e504a9301d bgs: update from 0.7 to 0.7.1 2015-05-12 17:24:50 +02:00
Pascal Wittmann d9383746e6 bgs: update from 0.6 to 0.7 2015-05-11 18:16:12 +02:00
Dmitry Bushev e7f4d36621 xdg-utils: http-based fetchgit url
Change xdg-utils fetchgit url to `http` alternative since it is
more proxy-friendly. The list of repository url alternatives
can be found at http://cgit.freedesktop.org/xdg/xdg-utils/
2015-04-17 16:36:41 +03:00
William A. Kennington III 65b74314e8 vdpauinfo: 0.9 -> 1.0 2015-03-26 13:59:24 -07:00
Nikolay Amiantov a1440a679d primus: remove old workaround, fix LD_LIBRARY_PATH 2015-03-09 23:02:47 +03:00