3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

30313 commits

Author SHA1 Message Date
Franz Pletz b116fa5ff2
Merge branch 'master' into staging 2017-07-28 16:08:30 +02: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
Ollie Charles 11e13306f7 ephemeralpg: init at 2.2 2017-07-28 11:51:12 +01: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
Jörg Thalheim 9fc4b66800 Merge pull request #27706 from wizzup/cleanup-pythonPackages
Cleanup pkgs/top-level/python-packages.nix
2017-07-28 10:54:59 +01:00
Muhammad Herdiansyah 159be2e4f5 bubblewrap: init at 0.1.8 2017-07-28 16:26:12 +07:00
wisut hantanong f1ef53286d python.pkgs.asn1ate: move to separate expression 2017-07-28 16:07:38 +07:00
wisut hantanong b01adce061 python.pkgs.chainmap: move to separate expression 2017-07-28 16:07:38 +07:00
wisut hantanong 3182658a4f python.pkgs.chai: move to separate expression 2017-07-28 16:07:37 +07:00
wisut hantanong 76c4ec7519 python.pkgs.area53: move to separate expression 2017-07-28 16:07:37 +07:00
wisut hantanong ff0e08c015 python.pkgs.args: move to separate expression 2017-07-28 16:07:37 +07:00
wisut hantanong e77f62df0f python.pkgs.funcsigs: move to separate expression 2017-07-28 16:07:36 +07:00
wisut hantanong f970ee8e7e python.pkgs.astor: move to separate expression 2017-07-28 16:07:36 +07:00
wisut hantanong 6d09e0c9be python.pkgs.apsw: move to separate expression 2017-07-28 16:07:32 +07:00
wisut hantanong 4cae4418e9 python.pkgs.apipkg: move to separate expression 2017-07-28 16:04:11 +07:00
Alexey Lebedeff 1d72b7345f dosbox-unstable: init at 2017-07-02
As current stable version segfaults when playing HoMM2, as described at
https://www.reddit.com/r/linux_gaming/comments/4dxfei/dosbox_segmentation_fault_core_dumped/

Also some missing dependencies (compared to stable version) were added:
- SDL_sound - for mounting .cue files with compressed sound
- SDL_net - for IPX support
- libpng - for making screenshots
2017-07-28 11:20:56 +03:00
Peter Hoeg e10d7655dc anydesk: init at 2.9.4 2017-07-28 16:05:35 +08:00
wisut hantanong 8e1a2250e1 python.pkgs.amqplib: move to separate expression 2017-07-28 13:36:38 +07:00
Frederik Rietdijk 265b007d7f Merge pull request #27696 from dtzWill/fix/one-skype-to-call-them-all
skype: remove deprecated
2017-07-28 08:33:25 +02:00
Robert Helgesson 19425c78e2
python-PyICU: 1.9.6 -> 1.9.7 2017-07-27 22:53:32 +02:00
Will Dietz 916c64416e aliases: add 'skype' -> 'skypeforlinux' for backwards compat 2017-07-27 14:57:46 -05:00
Will Dietz 946cabd5a1 skype: Remove old Linux version, deprecated July 1st 2017.
As reported on various news sites, and currently
on the skype linux download page it contains:

"Important notice: All Skype for Linux clients version 4.3 and older
will be retired on July 1, 2017. To keep chatting, please install the
latest version of Skype for Linux."
2017-07-27 14:43:02 -05:00
aszlig 664bbed412
all-packages.nix: Fix evaluation error for zfs
Regression introduced by 2799a94963.

Attribute zfsStable and zfsUnstable are now gone for the package
expression itself.

The mentioned commit however only changed the reference in
all-packages.nix for the kernel module, but not the userland package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @globin
2017-07-27 21:13:12 +02:00
Robin Gloster 2799a94963
zfs, spl: 0.6.5.11 -> 0.7.0 2017-07-27 19:00:54 +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 4907e58a02 python.pkgs.pyspf: add pydns to dependencies 2017-07-27 17:07:45 +03:00
Nikolay Amiantov 3a04b2c318 python.pkgs.pypolicyd-spf: 1.3 -> 2.0 2017-07-27 17:07:45 +03:00
Nikolay Amiantov 53c3e5ee97 python.pkgs.netifaces: 0.10.5 -> 0.10.6 2017-07-27 17:07:45 +03:00
Nikolay Amiantov c10cf27589 python.pkgs.ipaddr: 2.1.10 -> 2.1.11 2017-07-27 17:07:45 +03:00
Nikolay Amiantov 411fe648bd python.pkgs.pydns: use py3dns 3.1.1a for python3 2017-07-27 17:07:45 +03:00
Nikolay Amiantov a91cb71a83 python.pkgs.python-axolotl: 0.1.35 -> 0.1.39 2017-07-27 17:07:45 +03:00
Nikolay Amiantov bc52bf2cfe citra: init at 2017-07-26 2017-07-27 17:07:45 +03:00
Frederik Rietdijk 17496a2e07 Merge pull request #27682 from lsix/drop_django_1_10
pythonPackages.django_1_10: drop
2017-07-27 11:54:56 +02:00
Nikolay Amiantov 5a3c35cce5 beignet: 1.2.1 -> 1.3.1 2017-07-27 12:47:58 +03:00
Lancelot SIX 128430cd3e
pythonPackages.django_1_10: drop
Drop django_1_10 ahead of `release-17.09`[1] branch off. Django-1.10
will not be maintained for the entire lifetime of 17.09 so only the 1.8
and 1.11 branches are maintained (both are LTS versions[2]).

[1] https://groups.google.com/forum/#!topic/nix-devel/vILGXXbeCPg
[2] https://www.djangoproject.com/download/
2017-07-27 11:27:13 +02: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
Nikolay Amiantov 44a18ddd31 python.pkgs: move my several packages to separate files 2017-07-26 20:35:59 +03:00
Robert Scott 2989324d60 aws-auth: init at unstable-2017-07-24 2017-07-26 18:45:41 +02:00
Vladimír Čunát ac4c567c36
pythonPackages.augeas: init at 1.0.2 2017-07-26 17:56:11 +02:00
Nikolay Amiantov fe80dbaae0 python.pkgs.sphfile: init at 1.0.0 2017-07-26 18:36:52 +03:00
Nikolay Amiantov aa4d747ac9 python.pkgs.hmmlearn: init at 0.2.0 2017-07-26 18:36:52 +03:00
Nikolay Amiantov 50ed470a50 python.pkgs.PyChromecast: init at 0.8.1 2017-07-26 18:36:52 +03:00
Nikolay Amiantov 0a7f2acb17 boost164: init at 1.64.0 2017-07-26 18:36:52 +03:00
Orivej Desh 1ec5b7f1d3 mailutils: 2.2 -> 3.2 2017-07-26 13:32:59 +02:00
Peter Hoeg b23b1345f7 lcdproc: init at 0.5.9 2017-07-26 16:32:06 +08:00
Daiderd Jordan bbc5d15d0a
mypy: 0.501 -> 0.511 2017-07-25 21:52:54 -04:00
Daiderd Jordan 4c013a91f0 Merge pull request #27640 from ankhers/update_elixir_rc
elixir: 1.5.0-rc.2 -> 1.5.0
2017-07-25 19:47:49 +02:00
Robert Helgesson 97102f4580
perl-Unicode-CaseFold: 1.00 -> 1.01 2017-07-25 18:37:21 +02:00
Robert Helgesson 46383f48d4
perl-Perl-Critic: 1.128 -> 1.130 2017-07-25 18:37:21 +02:00