summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* jobs -> systemd.servicesRobin Gloster2016-01-17
| | | | missed an override
* Merge pull request #12441 from k0ral/acpidRobin Gloster2016-01-17
|\ | | | | Add volume and cd events to acpid configuration
| * Add volume and cd events to acpid configurationkoral2016-01-17
| |
* | xorg.xorgserver: wrap Xvfb with required flagsDomen Kožar2016-01-17
| |
* | types: remove references to new packageSetRobin Gloster2016-01-17
| | | | | | | | | | | | | | | | | | Reverts part of a04a7272aa38ada45e694281071b720d4abbd0df packageSet is slated to be introduced in #11866 but currently causes evalation errors. /cc @ts468
* | Add missing 'type', 'defaultText' and 'literalExample' in module definitionsThomas Strobel2016-01-17
| | | | | | | | | | | | - add missing types in module definitions - add missing 'defaultText' in module definitions - wrap example with 'literalExample' where necessary in module definitions
* | i18n: Fix vconsole colorscheme generationrnhmjoj2016-01-17
| | | | | | | | | | Close #12442. abbradar: remove trailing spaces.
* | nixos/plex: fix service startup, see #12422Pascal Wittmann2016-01-17
| |
* | Merge pull request #12419 from avnik/rmilter+rspamdDomen Kožar2016-01-17
|\ \ | | | | | | Rmilter+rspamd packages and NixOS modules
| * | nixos: add module for rmilterAlexander V. Nikolaev2016-01-16
| | |
| * | nixos: Add module for rspamdAlexander V. Nikolaev2016-01-16
| | |
* | | Merge pull request #12202 from thoughtpolice/nixos/tarsnap/sep-cachedirsDomen Kožar2016-01-17
|\ \ \ | | | | | | | | nixos: tarsnap - allow and document concurrent backups
| * | | nixos: tarsnap - allow keys for individual archivesAustin Seipp2016-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two concurrent tarsnap backups cannot be run at the same time with the same keys - completely separate sets of keys must be generated for each archive in this case, if you want backups to overlap. This extends the archives attrset to support a 'keyfile' option, which defaults to /root/tarsnap.key like the top-level attribute. With this change, if you generate two keys with tarsnap-keygen(1) and use each of those separately for each archive, you can backup concurrently. Signed-off-by: Austin Seipp <aseipp@pobox.com>
| * | | nixos: tarsnap - separate archive cachedirsAustin Seipp2016-01-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tarsnap locks the cachedir during backup, meaning if you specify multiple backups with a shared cache that might overlap (for example, one backup may take an hour), secondary backups will fail. This isn't very nice behavior for the obvious reasons. This splits the cache dirs for each archive appropriately. Note that this will require a rebuild of your archive caches (although if you were only using one archive for your whole system, you can just move the directory). Signed-off-by: Austin Seipp <aseipp@pobox.com>
* | | | Fix ISO building from a channelDomen Kožar2016-01-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building config.system.build.isoImage would fail with the following error using the channel: ln: failed to create symbolic link '/nix/store/zz0hzi5imrg4927v6f8mv281qs6v6pbq-nixos-16.03pre69762.e916273/nixos/nixpkgs/.': File exists The fix skips symlink as it already exists if the channel nixpkgs copy is used. Fixes #10367
* | | | disnix: propagate ejabberd username to the activation moduleSander van der Burg2016-01-16
| | | |
* | | | Merge pull request #12328 from makefu/zsh-allow-override-history-defaultsFranz Pletz2016-01-16
|\ \ \ \ | |_|/ / |/| | | programs.zsh: allow override of history defaults
| * | | programs.zsh: allow override of history defaultsmakefu2016-01-16
| | | |
* | | | nixos/tests/quake3: Don't quote +set argumentsaszlig2016-01-16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new upstream Git version of ioquake3 introduced in 7fc7502, the arguments to the quake3(server) binaries/wrappers may no longer be passed as full single arguments (like "+set foo bar") but rather as separate arguments (like "+set" "foo" "bar"), otherwise they will be completely ignored. Ran the x86_64-linux test on my machine and it now succeeds. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | nixos/tests/quake3: Fix eval due to unfree licenseaszlig2016-01-16
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced by 6b447a3c9bbee41389052d6fa9e08a53d8447656. In this commit the Quake 3 demo data now have a meta attribute which specifies the license as unfreeRedistributable. While I haven't found anything official about that on the web, let's just allow it to be used in the test because first of all, we have been using it for a long time (since 2009, introduced in 497760b) and second, because it will be quite some effort to rewrite the test with something like OpenArena (particularily because we need coverage data and need to use the ioquake3 version plus OpenArena-specific patches). Tested evaluation on my local system, but the VM test still fails. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | Merge pull request #11809 from mayflower/fix/libvirtd_serviceRobin Gloster2016-01-15
|\ \ \ | | | | | | | | libvirtd service: Move mutable configs to /var
| * | | libvirtd service: Move mutable configs to /varTristan Helmich2016-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifies libvirt package to search for configs in /var/lib and changes libvirtd service to copy the default configs to the new location. This enables the user to change e.g. the networking configuration with virsh or virt-manager and keep those settings.
* | | | nixos/postfix: Set type for extraConfig to "lines"aszlig2016-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Regression introduced by 3891d3e6541fe588ee2430e7b1bdb8d87d787a53. Merging multiple options with type "str" won't work and give an evaluation error. For extra configuration lines in the Postfix config it really should be "lines", especially because even the description mentions "extra lines". Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | matrix-synapse: init at 0.12.0roblabla2016-01-15
|/ / /
* | | Merge #12299: make firefox-like browsers wrapped by defaultVladimír Čunát2016-01-15
|\ \ \
| * | | release notes: document renames of firefox-like browsersVladimír Čunát2016-01-15
| | | |
* | | | nixos: Document "jobs" option removalDomen Kožar2016-01-14
| | | |
* | | | gale: init at 1.1happyMark Laws2016-01-13
| | | |
* | | | xserver service: wait for systemd-logindNikolay Amiantov2016-01-13
| | | | | | | | | | | | | | | | | | | | This seems the right thing to do, and most likely has fixed the race condition described at https://github.com/NixOS/nixpkgs/issues/12132#issuecomment-171284532
* | | | Merge pull request #12293 from abbradar/postfix-updatesPeter Simons2016-01-13
|\ \ \ \ | | | | | | | | | | Rework postfix module and package
| * | | | nixos/postfix: backwards compatibility with /var/postfixNikolay Amiantov2016-01-12
| | | | |
| * | | | nixos/postfix: add options to compile additional maps and aliasesNikolay Amiantov2016-01-12
| | | | |
| * | | | nixos/postfix: use path instead of direct package mentionsNikolay Amiantov2016-01-12
| | | | |
| * | | | nixos/postfix: move scripts to serviceConfigNikolay Amiantov2016-01-12
| | | | |
| * | | | nixos/postfix: move /var/postfix to /var/lib/postfix, fix access rightsNikolay Amiantov2016-01-12
| | | | |
| * | | | nixos/postfix: add users and groups only if needed, fix group nameNikolay Amiantov2016-01-12
| | | | |
| * | | | nixos/postfix: don't emit alias_maps config option if we don't have aliases setNikolay Amiantov2016-01-12
| | | | |
| * | | | nixos/postfix: add typesNikolay Amiantov2016-01-10
| | | | |
* | | | | gnome3: default to gnome 3.18Luca Bruno2016-01-13
| | | | |
* | | | | nixos/dspam: add moduleNikolay Amiantov2016-01-13
| | | | |
* | | | | nixos/opendkim: add moduleNikolay Amiantov2016-01-13
| | | | |
* | | | | nixos/postsrsd: add moduleNikolay Amiantov2016-01-13
| | | | |
* | | | | ejabberd: make config parameter nullable, so that the default bundled config ↵Sander van der Burg2016-01-12
| | | | | | | | | | | | | | | | | | | | can be used if none is given
* | | | | Merge branch 'swap-norestart' of git://github.com/abbradar/nixpkgsShea Levy2016-01-12
|\ \ \ \ \
| * | | | | swap service: don't restart mkswap.service on switchesNikolay Amiantov2016-01-12
| | | | | | | | | | | | | | | | | | | | | | | | Sadly, we can't instruct systemd to properly restart device-name.swap when this service restarts (or I haven't found the way to do so). As of now blindly restarting it would only get you a bunch of errors about device already used -- let's avoid it.
* | | | | | Fix running apache tomcat as a daemonSander van der Burg2016-01-12
|/ / / / /
* | | | | nixos/swap: fix stopping mkswap for encrypted deviceNikolay Amiantov2016-01-12
| | | | |
* | | | | nixos/cdemu: use system kernel modulesNikolay Amiantov2016-01-12
| | | | |
* | | | | nixos: fix acme service @abbradarDomen Kožar2016-01-12
| | | | |
* | | | | Revert "nixos/qemu-vm: Disable cache for $NIX_DISK_IMAGE"Domen Kožar2016-01-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6353f580f90c0fdd2b418fa853a78ec508bda2a5. Unfortunately cache=none doesn't work with all filesystem options. Hydra tests error out with: file system may not support O_DIRECT See http://hydra.nixos.org/build/30323625/