Commit graph

12681 commits

Author SHA1 Message Date
Michael Weiss bc8b634072 maim: 5.4.64 -> 5.4.65 2017-07-30 00:59:08 +02:00
Michael Weiss 6f2715e47d slop: 6.3.47 -> 6.3.48 2017-07-30 00:54:57 +02:00
Robert Helgesson 9d4d62923a
fgallery: add support for facedetect 2017-07-29 17:01:54 +02:00
Robert Helgesson 138dd4f9f1
fgallery: 1.8 -> 1.8.2 2017-07-29 17:01:53 +02:00
Robert Helgesson a444b34b52
facedetect: init at 0.1 2017-07-29 15:07:19 +02:00
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
Alexey Lebedeff 7723d9935f fzf: add script for finding 'share' folder
So that helper scripts can be easily sourced in interactive shell
configuration. `autojump` package was already present and had the same
requirements for findind a `share` folders, so I took an inspiration
there.

I beleive this is a better alternative to:
- https://github.com/NixOS/nixpkgs/pull/25080
- https://github.com/NixOS/nixpkgs/pull/27058

Replacing `$out/share/shell` with `$bin/share/fzf` was necessary to
prevent dependency loop in produced derivations.
2017-07-28 12:48:11 +03: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
Thomas Tuegel 101e0998e1
argyllcms: unset AR
Commit 093cc00cdd sets the AR environment variable
by default, but this causes the argyllcms Makefile to use the wrong command.
2017-07-22 19:54:57 -05:00
Thomas Tuegel 6a004bf9c8
Merge branch 'master' into bugfix/staging/stdenv 2017-07-21 20:36:34 -05:00
Thomas Tuegel 5265d551a9
grub2: unset CPP
Commit 093cc00cdd sets the environment variable
`CPP' by default, but this intereferes with dependency calculation.
2017-07-21 16:49:17 -05:00
Thomas Tuegel baad413416
ppp: fix invalid use of substituteInPlace
substituteInPlace was invoked with multiple targets on the command line, which
is not supported.
2017-07-21 15:45:24 -05:00
Thomas Tuegel c1c314c36f
openssh: unset LD
Commit 093cc00cdd, sets the LD environment
variable by default, but this confuses the openssh Makefile because `configure'
does not respect it.
2017-07-21 15:44:33 -05:00
Yann Hodique 7759b8c1ca fzf: 0.16.9 -> 0.16.10 2017-07-21 11:51:28 -07:00
k0ral 596e279979 network-manager-l2tp: fix configure step (#27541)
* network-manager-l2tp: don't run ./configure twice

* network-manager-l2tp: remove automake/autoconf
2017-07-21 17:18:54 +01:00
Eelco Dolstra 91dc811566
diffoscope: Move all required tools into pythonPath
Alternative fix for #27534 that prevents the use of a double wrapper
(creating even uglier script names than usual, like
..diffoscope-wrapped-wrapped).

This was my bad in 96d7f35e96.
2017-07-21 15:15:12 +02:00
Eelco Dolstra 3e68facc72
Revert "diffoscope: wrap executable and include tools in PATH"
This reverts commit 23ad77b998.

Double wrapper scripts considered harmful.
2017-07-21 15:15:04 +02:00
Jörg Thalheim e66195d39b Merge pull request #27534 from KaiHa/master
diffoscope: wrap executable and include tools in PATH
2017-07-21 13:40:23 +01:00
Eelco Dolstra 8a31137441
nixUnstable: 1.12pre5506_3162ad5f -> 1.12pre5511_c94f3d55 2017-07-21 12:52:57 +02:00
Daiderd Jordan 7ea75395bc Merge pull request #27537 from sigma/pr/fzf-0.16.9
fzf: 0.16.8 -> 0.16.9
2017-07-21 11:20:20 +02:00
Tuomas Tynkkynen e879033c43 fio: 2.21 -> 2.99 2017-07-21 12:09:17 +03:00
Tuomas Tynkkynen 581637ba5a yle-dl: 2.17 -> 2.20 2017-07-21 11:41:25 +03:00
Yann Hodique 3bb5b83584 fzf: 0.16.8 -> 0.16.9 2017-07-20 22:48:00 -07:00
Michael Weiss 90afb0c10f maim: 5.4.63 -> 5.4.64 2017-07-21 02:10:20 +02:00
Kai Harries 23ad77b998 diffoscope: wrap executable and include tools in PATH
diffoscope was looking for the tools it uses during runtime, but the
tools there neither part of the closure nor were they in the
PATH. This commit fixes this.
2017-07-20 22:29:41 +02:00
Tuomas Tynkkynen 2712554f4f xfsprogs: 4.5.0 -> 4.11.0 2017-07-20 17:14:28 +03:00
Michael Weiss aee463b204 slop: 6.3.46 -> 6.3.47 2017-07-20 10:48:45 +02:00
Franz Pletz bbafe64bdd
hue-cli: init at 0.1.4 2017-07-20 04:20:07 +02:00
Franz Pletz ab9239f4f9
strongswan build chapoly module 2017-07-20 04:20:06 +02:00
Franz Pletz d59dc71148
strongswan: build xauth-pam module 2017-07-20 04:20:06 +02:00
Patrick Callahan 010163d04d ttyrec: fix build on Darwin (#27500)
* ttyrec: fix build on Darwin

* ttyrec: remove pointless empty list
2017-07-19 17:46:34 +01:00
zimbatm 2780e2a780 nixUnstable: pre5413_b4b1f452 -> pre5506_3162ad5f 2017-07-19 11:06:06 +01:00
Frederik Rietdijk ebc712f2b1 Merge pull request #27352 from adisbladis/vulnix-py36
vulnix: use zope.interface from pythonPackages
2017-07-19 11:46:19 +02:00
zimbatm 14f53e5251 Merge pull request #26214 from zimbatm/google-compute-image
Google compute image
2017-07-19 09:49:20 +01:00
Peter Hoeg e760337a22 Merge pull request #26393 from peterhoeg/f/pass
pass: add plugins to support importing and updating
2017-07-19 09:18:06 +08:00
Franz Pletz 99499a5e76
mitmproxy: use fetchpatch for patch retrieval 2017-07-18 23:35:31 +02:00
Daniel Peebles bd2e91e3a2 Merge pull request #27318 from copumpkin/darwin-high-sierra
Support High Sierra on Darwin
2017-07-18 17:06:06 -04:00
Michael Weiss 0d9a0efc88 slop: 6.3.41 -> 6.3.46 2017-07-18 22:28:32 +02:00
Tuomas Tynkkynen 3c9897431b afl: 2.44b -> 2.48b 2017-07-18 22:15:22 +03:00
Benno Fünfstück ae28f5cac8 Merge pull request #27455 from TomSmeets/hidlisten
hid-listen: init at 1.01
2017-07-18 15:30:12 +02:00
Benno Fünfstück dbe79a7d20 hid-listen: change platforms to linux only
package fails to build on darwin, it doesn't seem clang compatible
and hardcodes certain framework paths
2017-07-18 15:14:56 +02:00
Tuomas Tynkkynen 9ea795c264 pv: 1.6.0 -> 1.6.6 2017-07-18 13:41:06 +03:00
Eelco Dolstra 17642b5fd0
nix: 1.11.12 -> 1.11.13 2017-07-18 10:54:01 +02:00
Tom Smeets 75454c3122 hid-listen: fix typo 2017-07-18 10:28:30 +02:00
Jörg Thalheim 26f85e4253 Merge pull request #27410 from florianjacob/journalwatch
journalwatch & journalwatch service: init at 1.1.0
2017-07-18 08:19:33 +01:00
Aristid Breitkreuz 6793f27b23 Merge pull request #27436 from np/keybase-update
Keybase updates
2017-07-17 22:27:47 +02:00
Tom Smeets ff41ec7d80 hid-listen: init at 1.01 2017-07-17 21:14:28 +02:00
Yegor Timoshenko 90f0c3b93e html-xml-utils: 6.9 → 7.1, macOS support 2017-07-17 21:46:02 +03:00
Frederik Rietdijk 3eceecb90d Merge remote-tracking branch 'upstream/master' into HEAD 2017-07-17 13:52:01 +02:00
Yann Hodique 3d505a1acd lftp: 4.7.7 -> 4.8.0 2017-07-17 08:02:04 +02:00
Nicolas Pouillard f74a1e6bcb
Keybase updates
keybase: 1.0.20 -> 1.0.22
keybase-gui: 1.0.23-20170519175207.d6c5e9e -> 1.0.25-20170714172717.73f9070
kbfs: 20170209.d1db463 -> 20170429.44efa06
2017-07-17 00:10:23 +02:00
Jörg Thalheim b6f9047d01 Merge pull request #27418 from roconnor/tarsnap
tarsnap: 1.0.37 -> 1.0.38
2017-07-16 22:02:29 +01:00