about summary refs log tree commit diff
path: root/nixos
AgeCommit message (Collapse)AuthorFilesLines
2016-06-05Merge #15639: xorg-server 1.17.4 -> 1.18.3Vladimír Čunát3-2/+16
... and fglrxCompat to maintain compatibility.
2016-06-04nixos/pcscd: Improve and clean up moduleaszlig1-20/+35
So far the module only allowed for the ccid driver, but there are a lot of other PCSC driver modules out there, so let's add an option called "plugins", which boils down to a store path that links together all the paths specified. We don't need to create stuff in /var/lib/pcsc anymore, because we patched pcsclite to allow setting PCSCLITE_HP_DROPDIR. Another new option is readerConfig, which is especially useful for non-USB readers that aren't autodetected. The systemd service now is no longer Type=forking, because we're now passing the -f (foreground) option to pcscd. Tested against a YubiKey 4, SCR335 and a REINER SCT USB reader. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @wkennington
2016-06-03nixos manual: fix syntaxNikolay Amiantov1-1/+1
It appears I've cherry-picked wrong commit without this fix.
2016-06-03nixos manual: document Gtk and Qt themesNikolay Amiantov1-0/+9
2016-06-03Merge pull request #15895 from cerana/stage2-sysfsShea Levy1-0/+2
stage2: if no /proc, also mount /sys
2016-06-03fix https://github.com/NixOS/nixops/issues/331Domen Kožar1-1/+2
2016-06-03nixos/modules/misc/version.nix: check that .git is a directoryobadz1-2/+2
That's not the case for git submodules Fixes #15928
2016-06-03Explicitly specify the subsystem for /dev/vboxguestEelco Dolstra1-1/+1
Otherwise systemd gets confused and forgets about device units after reloading. https://github.com/NixOS/nixops/issues/391 https://github.com/systemd/systemd/issues/3423
2016-06-01fix manualDomen Kožar1-2/+2
2016-06-01Add hydra package and its NixOS module.Domen Kožar2-0/+419
This was originally removed in d4d0e449d7b96704eeaa2570255fb41c85c49613. The intent was not to maintain hydra expression at two places. Nowadays we have enough devs to maintain this despite copy/pasta. This should encourage more people to use Hydra, which is a really great piece of software together with Nix. Tested a deploy using https://github.com/peti/hydra-tutorial
2016-06-01nixos kde5: improve testJoel Moberg1-9/+32
IceWM is not part of KDE 5 and is now no longer part of the test. KDE 5 applications: Dolphin, System Monitor, and System Settings are started in this test.
2016-06-01Manual: Explicitly mark commands that require to be run as root (#15589)Wilhelm Schuster28-98/+101
* manual: Mark commands that require root Mark every command that requires to be run as root by prefixing them with '#' instead of '$'. * manual: Add note about commands that require root
2016-06-01stage2: if no /proc, also mount /sysNahum Shalman1-0/+2
2016-06-01Rename gummiboot moduleEelco Dolstra3-2/+2
2016-06-01Rename boot.loader.gummiboot.enable -> boot.loader.systemd-boot.enableEelco Dolstra4-14/+19
2016-06-01acme: added option `security.acme.preliminarySelfsigned` (#15562)Bob van der Linden2-46/+162
2016-06-01Merge pull request #15793 from abbradar/unity3d-pkgNikolay Amiantov2-0/+26
Unity3D package
2016-06-01iso-image.nix: Fix path to EFI blob after systemd-boot switchTuomas Tynkkynen1-1/+1
This evaluates, but I can't verify if it works. @edolstra
2016-05-31Use systemd-boot instead of gummibootEelco Dolstra5-12/+10
Gummiboot is part of systemd now so we may as well use it.
2016-05-30toxvpn: restartIfChanged = false & minor cleanupsobadz1-5/+3
2016-05-30syncthing service: respect cfg.package (#15810)anderspapitto1-2/+2
2016-05-30toxvpn: init at 20151111obadz3-0/+59
(Authored by @cleverca22)
2016-05-29nixos/containers: Create an empty machine-id fileaszlig1-0/+4
Since systemd version 230, it is required to have a machine-id file prior to the startup of the container. If the file is empty, a transient machine ID is generated by systemd-nspawn. See systemd/systemd#3014 for more details on the matter. This unbreaks all of the containers-* NixOS tests. Signed-off-by: aszlig <aszlig@redmoonstudios.org> Cc: @edolstra Closes: #15808
2016-05-29unity3d service: initNikolay Amiantov2-0/+26
2016-05-28slurm service: robust reference to slurm bin outputJoachim Fasting1-1/+1
2016-05-28slurm service: fix typo in option descriptionJoachim Fasting1-1/+1
2016-05-28networking config: specify resolv.conf options as list of stringsJoachim Fasting1-10/+8
2016-05-28networking config: support setting resolv.conf optionsChristian Zagrodnick1-6/+16
Closes: #11372
2016-05-28Merge pull request #15596 from rnhmjoj/masterJoachim Fasting1-6/+6
fish: 2.2.0 -> 2.3.0
2016-05-27diod service: Capabilities -> CapabilityBoundingSetJoachim Fasting1-1/+1
`Capabilities` is obsolete in recent systemd and will be simply ignored. Note: this is the only service using `Capabilites`, per `git grep`.
2016-05-27Merge pull request #15668 from joachifm/fontDir-builderDefsJoachim Fasting1-41/+13
config.fonts.fontdir: use runCommand instead of builderDefs
2016-05-27Merge branch 'staging'Vladimír Čunát4-5/+5
Includes a security update of libxml2.
2016-05-27Merge pull request #15745 from peterhoeg/tmux-envJoachim Fasting1-1/+6
tmux module: set TMUX_TMPDIR via environment instead of wrapper
2016-05-27tmux module: set TMUX_TMPDIR via environment instead of wrapperPeter Hoeg1-1/+6
2016-05-27KDE test: Bump kdm start timeoutEelco Dolstra1-0/+8
Hopefully this will fix random failures like http://hydra.nixos.org/build/36249079.
2016-05-26config.fonts.fontdir: use runCommand instead of builderDefsJoachim Fasting1-41/+13
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-26Merge branch 'master' into stagingVladimír Čunát42-107/+371
... to get the systemd update (rebuilding ~7k jobs).
2016-05-26nixos/tests/vbox: Fix invocation of dbusaszlig1-4/+4
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-26nixos/tests/vbox: Replace waitForWindow with xpropaszlig1-1/+3
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-26services.*ntp*: Add time-sync.target to ntp clients (#15714)Alexander Ried3-3/+8
See: https://www.freedesktop.org/software/systemd/man/systemd.special.html#time-sync.target
2016-05-26Fix failure to start old containersEelco Dolstra1-1/+1
The existence of $root/var/lib/private/host-notify as a socket prevented a bind mount: container foo[8083]: Failed to create mount point /var/lib/containers/foo/var/lib/private/host-notify: No such device or address
2016-05-26nixos/tests/vbox: Start X server with user "alice"aszlig1-0/+1
The VirtualBox tests so far ran the X server as root instead of user "alice" and it did work, because we had access control turned off by default. Fortunately, it was changed in 1541fa351b4d664c51dddaeaa67ee0652892f405. As a side effect, it caused all the VirtualBox tests to fail because they now can't connect to the X server, which is a good thing because it's a bug of the VirtualBox tests. So to fix it, let's just start the X server as user alice. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-26nixos/test-driver/Logger: Replace invalid UTF-8aszlig1-1/+3
Regression introduced by d84741a4bfb6ed2531ec7154479c147d2c9a737c. The mentioned commit actually is a good thing, because we now get the output from the X session. Unfortunately, for the i3wm test, the i3-config-wizard prints out the raw keyboard symbols directly coming from xcb, so the output isn't necessarily proper UTF-8. As the XML::Writer already expects valid UTF-8 input, we assume that everything that comes into sanitise() will be UTF-8 from the start. So we just decode() it using FB_DEFAULT as the check argument so that every invalid character is replaced by the unicode replacement character: https://en.wikipedia.org/wiki/Specials_(Unicode_block)#Replacement_character We simply re-oncode it again afterwards and return it, so we should always get out valid UTF-8 in the log XML. For more information about FB_DEFAULT and FB_CROAK, have a look at: http://search.cpan.org/~dankogai/Encode-2.84/Encode.pm#Handling_Malformed_Data Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2016-05-26Make i3wm test a release blockerDomen Kožar1-0/+1
Catch issues like https://github.com/NixOS/nixpkgs/commit/331fa2feff8cbdca5cc831d1fae36d9505618124
2016-05-26nixos/tests/installer.nix: nixos-generate-config detects LUKS since a7baec7obadz1-5/+0
Fixes nix-build '<nixos/release.nix>' -A tests.installer.luksroot.x86_64-linux
2016-05-26fish: 2.2.0 -> 2.3.0rnhmjoj1-6/+6
2016-05-25xsession: fix variable read before set introduced in c99608cobadz1-1/+1
2016-05-25nixos-generate-config: Emit LUKS configuration for boot deviceEelco Dolstra2-4/+23
2016-05-25nixos-generate-config: Enable strictnessEelco Dolstra1-4/+6
2016-05-25boot.initrd.luks.devices: Change into an attribute setEelco Dolstra4-30/+29
This allows setting options for the same LUKS device in different modules. For example, the auto-generated hardware-configuration.nix can contain boot.initrd.luks.devices.crypted.device = "/dev/disk/..."; while configuration.nix can add boot.initrd.luks.devices.crypted.allowDiscards = true; Also updated the examples/docs to use /disk/disk/by-uuid instead of /dev/sda, since we shouldn't promote the use of the latter.