alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
112004 commits 217 branches 121 tags 4.5 GiB
Commit graph

382 commits

Author SHA1 Message Date
aszlig 6e5d2f8963
nixos/xserver: Properly validate XKB options 
Checking the keyboard layout has been a long set of hurdles so far, with
several attempts. Originally, the checking was introduced by @lheckemann
in #23709.

The initial implementation just was trying to check whether the symbols/
directory contained the layout name.

Unfortunately, that wasn't enough and keyboard variants weren't
recognized, so if you set layout to eg. "dvorak" it will fail with an
error (#25526).

So my improvement on that was to use sed to filter rules/base.lst and
match the layout against that. I fucked up twice with this, first
because layout can be a comma-separated list which I didn't account for
and second because I ran into a Nix issue (NixOS/nix#1426).

After fixing this, it still wasn't enough (and this is btw. what
localectl also does), because we were *only* matching rules but not
symbols, so using "eu" as a layout won't work either.

I decided now it's the time to actually use libxkbcommon to try
compiling the keyboard options and see whether it succeeds. This comes
in the form of a helper tool called xkbvalidate.

IMHO this approach is a lot less error-prone and we can be sure that we
don't forget about anything because that's what the X server itself uses
to compile the keymap.

Another advantage of this is that we now validate the full set of XKB
options rather than just the layout.

Tested this against a variety of wrong and correct keyboard
configurations and against the "keymap" NixOS VM tests.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @lheckemann, @peti, @7c6f434c, @tohl, @vcunat, @lluchs
Fixes: #27597
 2017-07-28 12:39:55 +02:00
Nikolay Amiantov 21ad2a1631 virtualglLib: 2.5.1 -> 2.5.2 2017-07-27 17:07:45 +03:00
xd1le 0304177ced setroot: 1.4.4 -> 2.0.1 2017-07-24 05:38:06 +10:00
GRBurst 63ee6d6e29 xcwd: init at 2016-09-30 
fixes #27345
 2017-07-13 13:56:22 +01:00
Benno Fünfstück 387256c0f2 Merge pull request #27308 from vaibhavsagar/xautomation 
xautomation: init at 1.09
 2017-07-12 08:23:05 +02:00
Vaibhav Sagar b9dfbeb828 xautomation: init at 1.09 2017-07-12 14:13:10 +08:00
Benno Fünfstück 778169409f xvkbd: 3.7 -> 3.8 2017-07-11 22:44:44 +02:00
Franz Pletz 60cddbe3da
screen-message: 0.24 -> 0.25 2017-06-20 03:45:39 +02:00
Volth d2f453bc0d fix #25511 2017-06-05 23:37:53 +00:00
Cray Elliott c5fbf35be0 xpra: fix missed ffmpeg_3_2 reference 2017-04-30 16:58:33 -07:00
Cray Elliott c49a454210 mpv, xpra: depend on ffmpeg instead of ffmpeg_3_2 
effectively updates them to depend on ffmpeg_3_3
 2017-04-30 16:52:49 -07:00
Victor Calvert 5539f8acfa xpra: 2.0.1 -> 2.0.2 2017-04-28 23:39:19 -04:00
Victor Calvert 0d8b5be67d xpra: 0.17.6 -> 2.0.1 
Requires build against newer ffmpeg (3.2.x instead of 3.1.x)
because of new symbols:
FF_PROFILE_H264_MULTIVIEW_HIGH
FF_PROFILE_H264_STEREO_HIGH
 2017-04-04 23:55:12 -04:00
Dmitry Rets c7e885ff99 xkbset: init at 0.5 2017-04-02 02:17:30 +03:00
Michael Raskin eeef599ced wayv: install docs 2017-03-18 12:41:09 +01:00
Michael Raskin 5833da6ad5 wayv: init at 0.3 2017-03-18 12:41:09 +01:00
Michael Raskin 6e74e165cb xannotate: init at 20150301 2017-03-18 12:41:09 +01:00
Nikolay Amiantov f36b72107c primus: fix if nvidia is not used 
Fixes #23628
 2017-03-08 23:10:43 +03:00
Benno Fünfstück ce355bdafa xpra: install data files to correct location in $out 
The patch is no longer needed, with the wheel-based method that we use now
data_files *are* relative to the prefix.
 2017-03-06 13:06:51 +01:00
Jaka Hudoklin f5d81ed79b Merge pull request #20904 from offlinehacker/nixos/xserver/xpra 
Add xpra display-manager
 2017-03-05 01:32:23 +01:00
Benno Fünfstück ac592121b9 xrectsel: remove unnecessary DESTDIR=$out 
This avoids files being installed to $out/nix/store
 2017-03-03 12:59:54 +01:00
Benno Fünfstück a8458bb506 ffcast: remove unnecessary DESTDIR=$out 
This avoids files being installed to $out/nix/store
 2017-03-03 12:58:43 +01:00
Benjamin Herr 6cc50b2976 obconf: add libSM to fix build 2017-02-26 20:11:25 +01:00
romildo 8c98c311d3
nitrogen: 1.6.0 -> 1.6.1 2017-02-20 21:44:56 -05:00
Vladimír Čunát 714eabc5af
guile rev-deps: fix build by adding pkgconfig 
Without it packages fail to find the headers, after guile has split
them into a separate output in 218713a.
 2017-02-18 08:23:07 +01:00
Parnell Springmeyer 9e36a58649
Merging against upstream master 2017-02-13 17:16:28 -06:00
Nikolay Amiantov a841f6097c primusLib: fix receiving long library paths 2017-02-08 16:58:59 +03:00
Nikolay Amiantov 2fd2fcf54d linuxPackages.nvidia_x11: refactor, build more from source 
* Use libglvnd;
* Compile nvidia-settings, nvidia-persistenced from source;
* Generalize builder.
 2017-02-08 16:57:46 +03:00
Adrian Pistol f6e2772cd3 wmutils-opt: init at v1.0 2017-01-30 20:42:16 +00:00
Parnell Springmeyer 4aa0923009
Getting rid of the var indirection and using a bin path instead 2017-01-29 04:11:01 -06:00
Parnell Springmeyer e92b8402b0
Addressing PR feedback 2017-01-28 20:48:03 -08:00
Parnell Springmeyer a26a796d5c
Merging against master - updating smokingpig, rebase was going to be messy 2017-01-26 02:00:04 -08:00
Franz Pletz e02b96590d
xchainkeys: fix source and homepage url 2017-01-26 03:52:50 +01:00
Parnell Springmeyer bae00e8aa8
setcap-wrapper: Merging with upstream master and resolving conflicts 2017-01-25 11:08:05 -08:00
volth 69ed58d88f xorg.xserver: configure --with-xkb-path= (#21653) 2017-01-18 02:57:15 +03:00
Joris Guyonvarch 1603526000 xrectsel: init at 0.3.2 (#21153) 2017-01-09 06:07:25 +01:00
Michael Raskin a486850992 xdg_utils: mimiSupport: update to the latest master 2017-01-04 15:01:46 +01:00
Joris Guyonvarch 4d2406c7d5 ffcast: init at 2.5.0 (#21141) 2016-12-14 14:22:00 +00:00
Jaka Hudoklin 7fd8dfc621 xpra: do not preset FONTCONFIG_FILE and XPRA_LOG_DIR env variables 2016-12-04 22:27:30 +01:00
Jaka Hudoklin adabb646bd xpra: add pam support 2016-12-04 22:26:43 +01:00
Vladimír Čunát 925b335607
Merge branch 'master' into staging 2016-11-26 11:27:09 +01:00
Joachim F 00597a07bb Merge pull request #20644 from romildo/upd.xcape 
xcape: git-2015-03-01 -> 1.2
 2016-11-25 13:19:56 +01:00
Frederik Rietdijk 7dd7b9e218 arandr: use python2 2016-11-24 22:28:02 +01:00
Nikolay Amiantov a44cfd6e0d virtualglLib: 2.5 -> 2.5.1 2016-11-24 01:17:58 +03:00
romildo b4077f3210 xcape: git-2015-03-01 -> 1.2 2016-11-23 07:30:00 -02:00
Vladimír Čunát b69f568f4c
Merge branch 'staging' 
Hydra rebuild looks fine; only a few Darwin jobs is queued:
http://hydra.nixos.org/eval/1304891?compare=1304807
 2016-11-19 04:35:51 +01:00
romildo 1a486c47af nitrogen: 1.5.2 -> 1.6.0 2016-11-18 09:49:27 -02:00
Vladimír Čunát b5e89fe9bf
Merge branch 'master' into staging 2016-11-15 00:20:19 +01:00
Frederik Rietdijk 1f501a2ced xpra: use python2 2016-11-08 22:48:55 +01:00
Joachim F 54f057266d Merge pull request #20244 from womfoo/bump/xdotool-3.20160805.1 
xdotool: 3.20150503.1 -> 3.20160805.1
 2016-11-08 00:58:51 +01:00