Commit graph

224 commits

Author SHA1 Message Date
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
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