Tuomas Tynkkynen
aadaa91379
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/networking/browsers/vivaldi/default.nix
pkgs/misc/emulators/wine/base.nix
2016-05-03 23:12:48 +03:00
aszlig
e7d3166656
nixos/tests/netboot: Fix evaluation error
...
Regression introduced by dfe608c8a2
.
The commit turns the two arguments into one attrset argument so we need
to adapt that to use the new calling convention.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-03 22:05:11 +02:00
William A. Kennington III
4dc716115f
Add missing files
...
(cherry picked from commit 5917fc2f50c87bbdd6ba0be339849a030a7eba10)
2016-05-02 13:04:41 -05:00
William A. Kennington III
60b3484928
dbus: Fix for new 1.10 version
...
(cherry picked from commit 68a4a6df3971d66aa988bba680351a30fbadbed3)
2016-05-02 13:04:20 -05:00
Vladimír Čunát
1b1e587aaf
Merge #15105 : nixos manual: rephrase indented strings
2016-05-02 11:58:45 +02:00
Joachim Fasting
60a27781d6
grsecurity module: fix grsec-lock unit ordering
...
Requirement without ordering implies parallel execution; it is crucial
that sysctl tunables are finalized before the lock is engaged, however.
2016-05-02 11:28:24 +02:00
aszlig
d2c64031a0
Merge pull request #14700 : olinks for NixOS manual
...
This allows to use <olink> tags inside NixOS options to reference
sections from the manual. I've originally introduced it in #14476 to
reference the Taskserver specific documentation from the options
reference but as suggested by @nbp, this was done as a separate pull
request to ensure greater visibility rather than being "hidden" in the
Taskserver branch.
The build time for the manual is around 30s on my machine without this
change and 34s with this change, so it shouldn't have a very big impact
on the build time of the manual.
Olinks between the options reference and the manual now will look like
this:
"More instructions about NixOS in conjuction with Taskserver can be
found in the NixOS manual at Chapter 15, Taskserver."
More documentation about olinks can be found here:
http://www.sagehill.net/docbookxsl/Olinking.html
Acked-by: Eelco Dolstra <eelco.dolstra@logicblox.com>
2016-05-02 11:01:13 +02:00
Arseniy Seroka
48b739cc25
Merge pull request #15094 from jraygauthier/jrg/brscan4_init_rebased
...
brscan4: init at 0.4.3-3
2016-05-01 21:48:30 +03:00
Raymond Gauthier
758e8bd1a1
brscan4: init at 0.4.3-3
...
A sane backend for recent brother scanners.
Depends on the presence of etc files generated by the
nixos module of the same name.
Supports network scanner specification through the
nixos module.
2016-05-01 14:42:25 -04:00
Tobias Geerinckx-Rice
5508687ec2
Remove now useless proprietary Copy.com client and service
...
<https://techlib.barracuda.com/Copy/FAQ >
SaaS.
2016-05-01 14:38:08 +02:00
Thomas Tuegel
dbe1bb06d9
Merge pull request #14741 from cruegge/dbus-activation-environment
...
xsession: Update DBus activation environment
2016-05-01 06:55:35 -05:00
Franz Pletz
02760890f3
Merge pull request #14992 from avnik/rspamd
...
Rspamd/Rmilter update
2016-05-01 12:49:56 +02:00
Domen Kožar
640ec5f649
netboot: fix eval
2016-05-01 10:00:31 +01:00
Thomas Tuegel
370120bd5f
kde5: don't install GStreamer modules system-wide
2016-04-30 12:22:01 -05:00
Thomas Tuegel
2875293615
nixos/networkmanager: fix syntax error
2016-04-30 12:20:06 -05:00
iarizc Leuname
7e32b83d77
Manual: rephrase definition for indented strings
...
Closes #15076
2016-04-30 16:59:07 +03:00
Domen Kožar
d2dcbd3c00
Revert "Manual: rephrase definition for indented strings" ( #15103 )
2016-04-30 14:29:09 +01:00
NotaseCretagen
e704c90b50
Manual: rephrase definition for indented strings ( #15086 )
...
Closes #15076
2016-04-30 12:14:06 +01:00
Eelco Dolstra
928cf63a92
netboot -> netboot.x86_64-linux
...
For consistency, and in case we ever want to support another
architecture.
2016-04-29 20:46:36 +02:00
Arseniy Seroka
277154e901
Merge pull request #15078 from phile314/master
...
elasticsearch: Install elastic search modules properly
2016-04-29 20:31:47 +03:00
Joachim Fasting
4fb9b060c3
Merge pull request #15063 from mayflower/upstream/graylog
...
Add graylog package and service
2016-04-29 15:32:53 +02:00
Philipp Hausmann
7d7380b011
elasticsearch: Install elastic search modules properly, fixes groovy script support.
2016-04-29 12:59:50 +02:00
Domen Kožar
90d7041ce4
PXE boot: add manual section and note in changelog
2016-04-29 10:42:45 +01:00
Nahum Shalman
83c0aca062
installer: simple PXE bootable NixOS installer
...
The Nix store squashfs is stored inside the initrd instead of separately
(cherry picked from commit 976fd407796877b538c470d3a5253ad3e1f7bc68)
Signed-off-by: Domen Kožar <domen@dev.si>
2016-04-29 10:42:39 +01:00
Eelco Dolstra
ecfc523d32
Update EC2 AMIs to 16.03.659.011ea84
...
This includes the binutils mass rebuild.
2016-04-29 10:28:35 +02:00
Joachim Fasting
45c0a63c17
Merge pull request #15014 from groxxda/refactor/fail2ban
...
fail2ban: rework service
2016-04-29 01:26:55 +02:00
Tristan Helmich
e48580c083
graylog service: Initial graylog service
2016-04-28 23:27:57 +02:00
Nikolay Amiantov
c4440c9c74
Revert "pulseaudio: select correct outputs"
...
This reverts commit 5e2bb0b31c
.
2016-04-28 17:06:09 +03:00
Nikolay Amiantov
5e2bb0b31c
pulseaudio: select correct outputs
...
Original fixes by ttuegel and peterhoeg.
2016-04-28 16:45:42 +03:00
Nikolay Amiantov
d619a75da1
pulseaudio: select correct outputs
...
Original fixes by ttuegel and peterhoeg.
2016-04-28 16:42:16 +03:00
Alexander V. Nikolaev
36954ee405
rspamd: configurable bindSocket and bindUISocket
2016-04-28 14:21:19 +03:00
Alexander V. Nikolaev
5c260399e1
rmilter: correct paths to sockets
2016-04-28 14:21:18 +03:00
Alexander V. Nikolaev
c84c174eb2
rmilter: socket activation in nixos
2016-04-28 14:21:04 +03:00
Tuomas Tynkkynen
de0847c731
taskserver service: Really check that it is enabled
2016-04-28 01:14:17 +03:00
Tuomas Tynkkynen
4ff8f377af
Merge remote-tracking branch 'upstream/master' into staging
2016-04-28 00:13:53 +03:00
Tuomas Tynkkynen
49d1acb50f
Merge pull request #14896 from elitak/rtl8723bs
...
rtl8723bs: improved build and split off firmware
2016-04-28 00:04:44 +03:00
Graham Christensen
56f8206b85
Update etc
example to not use a real config file
...
A user noticed the example for `hosts`, took the `mode` permissions literally, and ended up with surprising behavior on their system. Updating the documentation to not reference a real config file which might have real permissions requirements.
2016-04-27 10:27:52 -05:00
Nikolay Amiantov
e6e7c1e914
logmein-hamachi: init at 2.1.0.139, add nixos service
2016-04-27 16:15:01 +03:00
Nikolay Amiantov
c5fcab987b
pulseaudio service: fix service path
2016-04-27 15:51:28 +03:00
Nikolay Amiantov
7ac1ef05fa
networkmanager service: fixup
2016-04-27 13:51:43 +03:00
Nikolay Amiantov
16bdef1350
bluetooth service: fix w.r.t. multiple outputs
2016-04-27 13:48:06 +03:00
Arnold Krille
3ae8810ffa
containers: test imperative and ipv4 in small-release ( #15015 )
...
Test imperative containers and declarative containers with ipv4. These two
tests are basically the extraction of the containers test from before.
2016-04-26 22:38:47 +02:00
Nikolay Amiantov
89dfbd1215
Merge commit 'refs/pull/14936/head' of git://github.com/NixOS/nixpkgs
2016-04-26 23:14:47 +03:00
Alexander Ried
fc941899a3
fail2ban: rework service
2016-04-26 20:34:41 +02:00
Nikolay Amiantov
23a093ebe8
dbus service: fix path to the launch helper
2016-04-26 16:10:30 +03:00
Nikolay Amiantov
dfe608c8a2
symlinkJoin: accept set as an argument with additional options
2016-04-26 15:37:42 +03:00
Thomas Tuegel
c25907d072
network-manager: multiple outputs
2016-04-25 19:04:24 -05:00
Thomas Tuegel
522ed7ce76
nixos/kde5: phonon-backend-gstreamer is not optional
2016-04-25 19:04:24 -05:00
Thomas Tuegel
5896befee0
nixos/kde5: install kactivitymanagerd
2016-04-25 19:04:24 -05:00
Christoph Ruegge
769a33bedd
xsession: make updating DBus environment optional
2016-04-25 23:37:18 +02:00