Commit Graph

12625 Commits

Author SHA1 Message Date
Frederik Rietdijk
b2608b8910 Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-29 13:08:11 +02:00
Frederik Rietdijk
1c94c54c4a cli53: fix build 2017-07-29 13:04:07 +02:00
adisbladis
fcb6e72ddf vulnix: use zc_lockfile, zodbpickle and persistent from pythonPackages 2017-07-28 16:13:28 +02:00
Franz Pletz
b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02:00
Tuomas Tynkkynen
d2f45babe3 xfstests: Use keyutils 2017-07-28 16:24:59 +03:00
Frederik Rietdijk
e01181a32c Merge pull request #27708 from konimex/bubblewrap
bubblewrap: init at 0.1.8
2017-07-28 14:55:36 +02:00
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
Muhammad Herdiansyah
159be2e4f5 bubblewrap: init at 0.1.8 2017-07-28 16:26:12 +07:00
Robert Helgesson
fc75595236
gmic: remove myself as maintainer 2017-07-27 22:54:53 +02:00
Robert Helgesson
78815d0c51
mimeo: 2017.2.9 -> 2017.6.6 2017-07-27 22:53:55 +02:00
Volth
688dc4e4c3 tinc_pre: avoid infinite loop with EBADFD on network restart 2017-07-27 18:04:33 +02:00
Eelco Dolstra
8dfa472178 Merge pull request #27690 from konimex/nawk
nawk: init at 20121220
2017-07-27 17:01:51 +02:00
Muhammad Herdiansyah
d31e7ee1bd nawk: init at 20121220 2017-07-27 21:51:10 +07:00
Nikolay Amiantov
9ffdbe3853 update-resolv-conf: 2016-09-30 -> 2017-06-21 2017-07-27 17:07:45 +03:00
Nikolay Amiantov
a90fb0f550 dropbear: 2016.74 -> 2017.75 2017-07-27 17:07:45 +03:00
Nikolay Amiantov
21ad2a1631 virtualglLib: 2.5.1 -> 2.5.2 2017-07-27 17:07:45 +03:00
Frederik Rietdijk
a905b7cd0c Merge pull request #27599 from vidbina/merge/qesteidutil/master
qesteidutil: 3.12.2.1206 -> 3.12.5.1233
2017-07-27 09:20:17 +02:00
Daiderd Jordan
7cd9779488
upx: fix clang build 2017-07-26 23:24:49 +02:00
Sander van der Burg
94f0a6793b disnix: 0.7.1 -> 0.7.2 2017-07-26 19:22:19 +00:00
John Ericson
9be40841ea Merge remote-tracking branch 'upstream/master' into staging-base
Conflicts:
	pkgs/build-support/cc-wrapper/default.nix
	pkgs/build-support/gcc-wrapper-old/builder.sh
	pkgs/build-support/trivial-builders.nix
	pkgs/desktops/kde-4.14/kde-package/default.nix
	pkgs/development/compilers/openjdk-darwin/8.nix
	pkgs/development/compilers/openjdk-darwin/default.nix
	pkgs/development/compilers/openjdk/7.nix
	pkgs/development/compilers/openjdk/8.nix
	pkgs/development/compilers/oraclejdk/jdk-linux-base.nix
	pkgs/development/compilers/zulu/default.nix
	pkgs/development/haskell-modules/generic-builder.nix
	pkgs/misc/misc.nix
	pkgs/stdenv/generic/builder.sh
	pkgs/stdenv/generic/setup.sh
2017-07-26 13:46:04 -04:00
Robin Gloster
27800258e1 aws-auth: clean up 2017-07-26 18:45:41 +02:00
Robert Scott
2989324d60 aws-auth: init at unstable-2017-07-24 2017-07-26 18:45:41 +02:00
Robin Gloster
4a787b292a mailutils: clean up and fix last test 2017-07-26 13:32:59 +02:00
Orivej Desh
1ec5b7f1d3 mailutils: 2.2 -> 3.2 2017-07-26 13:32:59 +02:00
Peter Hoeg
998a0e818e crudini: actually run tests and install docs/man 2017-07-26 13:00:29 +08:00
Charles Strahan
cadb42fafb
honcho: 0.6.6 -> 1.0.1 2017-07-25 23:22:01 -04:00
Graham Christensen
8a8c13f9df Merge pull request #27622 from dtzWill/update/haproxy-1.7.8
haproxy: 1.7.3 -> 1.7.8
2017-07-25 21:27:51 -04:00
Franz Pletz
b33b40036b
ddccontrol: disable bindnow hardening
Caused segfaults. Fixes #27612.
2017-07-25 22:58:25 +02:00
Lluís Batlle i Rossell
f338e99039 zstd: 1.2.0 -> 1.3.0 2017-07-25 17:57:50 +02:00
Tuomas Tynkkynen
62cd492c82 xfstests: Use the newly added quota package 2017-07-25 17:29:21 +03:00
Tuomas Tynkkynen
dd248fad87 xfstests: 2017-03-26 -> 2017-07-16 2017-07-25 17:29:21 +03:00
Tuomas Tynkkynen
c1597af1f2 dateutils: Fix whitespace 2017-07-25 17:29:21 +03:00
Tuomas Tynkkynen
b3b1ae67e5 quota: init at 4.03 2017-07-25 17:29:21 +03:00
Tim Steinbach
4a4a33ff88 Merge pull request #27582 from NeQuissimus/remove_accelio
accelio: Remove
2017-07-25 09:17:23 -04:00
Jörg Thalheim
fb9120d5e7 Merge pull request #27613 from therealpxc/tidy
html-tidy: 5.2.0 -> 5.4.0
2017-07-25 07:40:07 +01:00
Charles Strahan
c1fdf3341b Merge pull request #27347 from cstrahan/osquery-new
osquery: init at 2.5.2
2017-07-24 21:51:10 -04:00
Charles Strahan
232c34b8f4
osquery: use packaged sqlite and gtest/gmock 2017-07-24 21:48:08 -04:00
Charles Strahan
53426f6cb9
osquery: init at 2.5.2 2017-07-24 21:47:32 -04:00
Will Dietz
269976c45a haproxy: 1.7.3 -> 1.7.8 2017-07-24 13:44:53 -05:00
Tobias Geerinckx-Rice
275059c34a Merge pull request #27616 from jfrankenau/update-borg
borgbackup: 1.0.10 -> 1.0.11
2017-07-24 18:44:21 +00:00
Johannes Frankenau
c6e52bc430 borgbackup: 1.0.10 -> 1.0.11 2017-07-24 19:04:07 +02:00
Patrick Callahan
edef4459f6 html-tidy: 5.2.0 -> 5.4.0 2017-07-24 09:19:03 -07:00
Jörg Thalheim
3b6215e565 Merge pull request #27564 from vyp/upd/setroot
setroot: 1.4.4 -> 2.0.1
2017-07-24 14:41:04 +01:00
Silvan Mosberger
f4a8e6ab7f znapzend: 0.15.7 -> 0.17.0 2017-07-24 05:01:08 +02:00
Peter Hoeg
dcd6467936 xxd: init at 8.0.0442 2017-07-24 09:37:58 +08:00
David Asabina
97cc4fdd9e qesteidutil: 3.12.2.1206 -> 3.12.5.1233 2017-07-24 01:13:35 +02:00
Benno Fünfstück
1d1735ce0f nix-index: init at 0.1.0 2017-07-23 23:12:37 +02:00
xd1le
0304177ced setroot: 1.4.4 -> 2.0.1 2017-07-24 05:38:06 +10:00
Tim Steinbach
6e00673e7f
accelio: Remove 2017-07-23 10:47:13 -04:00
Frederik Rietdijk
29f91c107f Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-23 11:23:43 +02:00