Commit Graph

84331 Commits

Author SHA1 Message Date
Joachim Fasting
9fff4b31fa Merge pull request #15731 from earldouglas/picat
picat: init at 1.9-4
2016-05-27 17:07:04 +02:00
Joachim Fasting
39d7f65a33 Merge pull request #15710 from chris-martin/sublime-desktop-item
sublime: add a desktop item and icons
2016-05-27 16:57:32 +02:00
Joachim Fasting
0eaea886b9 Merge pull request #15685 from chris-martin/idea-wmClass
idea: set StartupWMClass on desktop item
2016-05-27 16:56:51 +02:00
obadz
f0de1c75b5 docker: fix build with systemd 230 2016-05-27 15:42:15 +01:00
Joachim Fasting
f7e7b814a9 Merge pull request #15668 from joachifm/fontDir-builderDefs
config.fonts.fontdir: use runCommand instead of builderDefs
2016-05-27 16:17:58 +02:00
Bjørn Forsman
5f6542de2a qtcreator: unbreak build by disabling docs
Not ideal, but at least it builds now :-)
2016-05-27 15:59:36 +02:00
Vladimír Čunát
f94a806c4a properly fix the maintainer.matthewbauer problem
There was inconsisten usage of maintainers.matthewbauer and mbauer.
/cc @matthewbauer I chose the github identifier, as it's customary.
2016-05-27 15:58:41 +02:00
Vladimír Čunát
e4832c7541 Merge branch 'staging'
Includes a security update of libxml2.
2016-05-27 15:58:40 +02:00
Peter Simons
60a890e35b Merge pull request #15752 from garbas/update/git-2.8.3
git: 2.8.0 -> 2.8.3
2016-05-27 15:58:12 +02:00
Bjørn Forsman
fc7c751515 Fix nixpkgs eval (caused by 'emscripten' expression)
Fixes this:

 $ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
 error: while evaluating ‘callPackageWith’ at .../lib/customisation.nix:93:35, called from .../pkgs/top-level/all-packages.nix:1411:24:
 while evaluating ‘makeOverridable’ at .../lib/customisation.nix:54:24, called from .../lib/customisation.nix:97:8:
 undefined variable ‘srcFC’ at .../pkgs/development/compilers/emscripten-fastcomp/default.nix:26:14

Also, "matthewbauer" is not defined in ./lib/maintainers.nix, comment
out.

Caused by f646b9295e and
d078fe1e9c.
2016-05-27 15:53:40 +02:00
Rok Garbas
800de8db21 git: 2.8.0 -> 2.8.3 2016-05-27 14:58:48 +02:00
José Romildo Malaquias
aa4e1093c5 opensmtpd: fix some configure options (#15742) 2016-05-27 13:36:42 +01:00
Joachim Fasting
a487cacef4 Merge pull request #15745 from peterhoeg/tmux-env
tmux module: set TMUX_TMPDIR via environment instead of wrapper
2016-05-27 13:23:48 +02:00
Nikolay Amiantov
e68878a728 rxvt_unicode-with-plugins: passthru plugins
Because we hardcode a list of useful plugins, it may be useful for
someone who's overriding this.

See https://github.com/NixOS/nixpkgs/issues/15743#issuecomment-222112433
2016-05-27 13:42:22 +03:00
Nikolay Amiantov
ebe1cbe0da symlinkJoin: allow arbitrary additional attributes 2016-05-27 13:42:22 +03:00
Joachim Schiele
e5ac7103ff Merge pull request #15738 from matthewbauer/emscripten-fix
looks promising. let's see what hydra thinks about it. thanks
2016-05-27 12:23:09 +02:00
Nikolay Amiantov
d231cdf51f rxvt_unicode-with-plugins: don't be paranoid about Perl support
Fixes #15743
2016-05-27 12:56:52 +03:00
Peter Hoeg
5404595b55 tmux module: set TMUX_TMPDIR via environment instead of wrapper 2016-05-27 17:29:19 +08:00
Eelco Dolstra
b786b00023 KDE test: Bump kdm start timeout
Hopefully this will fix random failures like
http://hydra.nixos.org/build/36249079.
2016-05-27 11:22:27 +02:00
Luca Bruno
ef8ea38fe8 gdm: fix build with systemd 230 2016-05-27 11:18:16 +02:00
obadz
1fb49e8089 Revert "gdm: apply substition to cope with systemd 229 -> 230 upgrade"
This reverts commit 745c379f1b.

@lethalman will commit a better solution
2016-05-27 10:17:11 +01:00
obadz
745c379f1b gdm: apply substition to cope with systemd 229 -> 230 upgrade
Inspired from eee5bf72c9
2016-05-27 10:13:14 +01:00
Luca Bruno
663beaa79f Revert "Revert "systemd: 229 -> 230""
This reverts commit 11894782ed.

cc @edolstra, re-reverting. Looks like it's an intended systemd change.
2016-05-27 11:07:29 +02:00
Luca Bruno
11894782ed Revert "systemd: 229 -> 230"
This reverts commit a2f21a54a1.

cc @edolstra the new version does not install many .pc files
like login, journal, daemon, ...
2016-05-27 11:06:21 +02:00
Vladimír Čunát
88a6ce17ef nixpkgs manual: fix #15735: correct dash rendering 2016-05-27 10:40:49 +02:00
Vladimír Čunát
dc13593b9f libxml2: disable checks on Darwin
Apparently they won't work there.
2016-05-27 09:45:46 +02:00
Matthew Bauer
f646b9295e Add myself as maintainer for emscripten, emscripten-fastcomp. 2016-05-26 19:05:13 -05:00
Matthew Bauer
d078fe1e9c Fix hash issue in emscripten.
Just use "fetchFromGitHub" because that seems to be more
reliable. Still unclear what the actual issue was but
I'm thinking this will fix it. At least, this will
put it more in line with other packages.
2016-05-26 19:05:07 -05:00
Joachim Fasting
e746e1ffbc Merge pull request #15667 from joachifm/delete-box2d_2_0_1
box2d_2_0_1: delete expression
2016-05-27 00:34:27 +02:00
Joachim Fasting
1c07183dc1 Merge pull request #15728 from grahamc/facetimehd-firmware
Facetimehd-Firmware: Update,  add update documentation, add myself as maintainer
2016-05-27 00:21:21 +02:00
James Earl Douglas
292f9e5f23 picat: init at 1.9-4 2016-05-26 15:29:03 -06:00
Joachim Fasting
b24e58a82b
config.fonts.fontdir: use runCommand instead of builderDefs
The primary motivation here is to get rid of builderDefs, but now the
resulting font directory is also linked into /run/current-system/sw,
which fixes #15194.
2016-05-26 22:39:01 +02:00
Arseniy Seroka
8479e0ad84
purple-telegram: fix hash 2016-05-26 22:51:23 +03:00
Graham Christensen
f993e6543a
facetimehd, facetimehd-firmware: Add grahamc as a maintainer 2016-05-26 14:10:03 -05:00
Graham Christensen
24a87685e2
facetimehd: Document updating the facetimehd-firmware 2016-05-26 14:10:01 -05:00
aszlig
6f8d2d6917
kmscon: Fix build against systemd 230
From the changelog:

  The compatibility libraries libsystemd-daemon.so,
  libsystemd-journal.so, libsystemd-id128.so, and libsystemd-login.so
  which have been deprecated since systemd-209 have been removed along
  with the corresponding pkg-config files. All symbols provided by those
  libraries are provided by libsystemd.so.

So let's just replace the use of libsystemd-daemon and libsystemd-login
with libsystemd in the configure script until a new version of kmscon
comes along.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-26 21:05:55 +02:00
Graham Christensen
27bf0d203d
facetimehd-firmware: 1.43 -> 1.43_4 2016-05-26 14:05:45 -05:00
David Tulig
ddf264536c syncthing: 0.12.23 -> 0.12.25 (#15723)
fixes #15633
2016-05-26 21:03:18 +02:00
Derek Gonyeo
1115efe777 acbuild: 0.2.2 -> 0.3.0 (#15711) 2016-05-26 20:34:41 +02:00
Franz Pletz
4962f52b88 openvpn: --enable-password-save was removed 2016-05-26 19:17:39 +02:00
Franz Pletz
bf12560053 openvpn: Fix build for systemd 230 2016-05-26 19:16:45 +02:00
Franz Pletz
93c010ddad php: 5.5.35 -> 5.5.36, 7.0.6 -> 7.0.7 (security)
See:

  * https://secure.php.net/ChangeLog-5.php#5.5.36
  * https://secure.php.net/ChangeLog-7.php#7.0.7
2016-05-26 18:44:31 +02:00
Franz Pletz
28395e85da libndp: 1.5 -> 1.6 (security)
Fix CVE-2016-3698.

See https://lwn.net/Articles/688591/.
2016-05-26 17:22:46 +02:00
Daniel Peebles
be6710d029 Merge pull request #15715 from ChrisJefferson/fix-darwin-p7zip
p7zip: Fix darwin build
2016-05-26 11:14:53 -04:00
Damien Cassou
e584482a86 Merge pull request #15700 from DamienCassou/gpaste-3.18.4
gpaste: 3.18.3 -> 3.18.4
2016-05-26 17:11:31 +02:00
Vladimír Čunát
81039713fa Merge branch 'master' into staging
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26 16:50:22 +02:00
aszlig
3b8a2a793c
nixos/tests/vbox: Fix invocation of dbus
VBoxService needs dbus in order to work properly, which failed to start
up so far, because it was searching in /run/current-system/sw for its
configuration files.

We now no longer run with the --system flag but specify the
configuration file directly instead.

This fixes at least the "simple-gui" test and probably the others as
well, which I haven't tested yet.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-26 16:48:32 +02:00
aszlig
3fd3911105
nixos/tests/vbox: Replace waitForWindow with xprop
We can't use waitForWindow here because it runs xwininfo as user root,
who in turn is not authorized to connect to the X server running as
alice.

So instead, we use xprop from user alice which should fix waiting for
the VirtualBox manager window.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-26 16:48:32 +02:00
Vladimír Čunát
058c71498e grsecurity_base_linux_4_5: get all patches
This in particular includes qat_common_Makefile to fix parallel make.
2016-05-26 16:35:43 +02:00
Vladimír Čunát
ee1a10ee6b Revert "root: enable parallel building"
This reverts commit 2991fdca52.
Hydra builds often report missing various files.
2016-05-26 16:27:59 +02:00