about summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge pull request #5737 from ↵lethalman2015-01-30
|\ | | | | | | | | matthiasbeyer/add-gitolite_admin_pubkey_oneline_note Add note that admin-pub-key for gitolite has to be written in one line
| * different wording for adminPubkey descriptionRyan Mulligan2015-01-12
| | | | | | Maybe this wording is a slight improvement?
| * Add note that administrative public key for gitolite has to be written in ↵Matthias Beyer2015-01-12
| | | | | | | | one line
* | Merge pull request #6045 from ragnard/apache-kafkalethalman2015-01-30
|\ \ | | | | | | apache-kafka: New package and service
| * | apache-kafka: New service for Apache KafkaRagnar Dahlén2015-01-29
| | |
* | | Merge PR #5772, boot.loader.timeoutLuca Bruno2015-01-30
|\ \ \
| * | | nixos: gummiboot: change default to 1000 if boot.loader.timeout is nullBob van der Linden2015-01-30
| | | | | | | | | | | | | | | | | | | | | | | | When gummiboot.timeout == null, the menu will still be skipped. When gummiboot.timeout == 0, the menu will also be skipped. The only way to show the menu 'indefinitely' is to show it a long time.
| * | | nixos: loader: added generic config.boot.loader.timeout optionBob van der Linden2015-01-30
| |/ / | | | | | | | | | | | | timeout options of grub and gummiboot will inherit the value of this option by default.
* | | Merge branch 'tlsdate' of git://github.com/4z3/nixpkgsShea Levy2015-01-30
|\ \ \ | |/ / |/| |
| * | nixos: Add tlsdated servicetv2015-01-21
| | |
* | | Merge pull request #5615 from nckx/freefalllethalman2015-01-28
|\ \ \ | | | | | | | | Add freefall: hard drive protection on HP/Dell laptops
| * | | Add freefall NixOS service moduleTobias Geerinckx-Rice2015-01-28
| | | |
* | | | Restrict the length of container namesEelco Dolstra2015-01-28
| | | |
* | | | Merge pull request #5939 from ↵Jaka Hudoklin2015-01-28
|\ \ \ \ | |/ / / |/| | | | | | | | | | | offlinehacker/nixos/containers/containers_in_containers nixos/containers: make containers in containers possible
| * | | nixos/containers: make containers in containers possibleJaka Hudoklin2015-01-28
| | | |
* | | | ntpd: Fork into the backgroundEelco Dolstra2015-01-28
| | | | | | | | | | | | | | | | | | | | With -n, ntpd will write log messages to both syslog and stderr, which is ugly.
* | | | nixos-rebuild: Update fallback code to update NixEelco Dolstra2015-01-27
| | | |
* | | | Remove executable bits from non-executable filesEelco Dolstra2015-01-27
| | | |
* | | | add stable attrs for plasma5, kf5, and kdeAppsThomas Tuegel2015-01-26
| | | |
* | | | kde5: simplify package listThomas Tuegel2015-01-26
| | | |
* | | | kdm: install default backgroundsThomas Tuegel2015-01-26
| | | |
* | | | startkde: don't split script between NixOS module and packageThomas Tuegel2015-01-26
| | | |
* | | | kde5: warn if enabled with kde4Thomas Tuegel2015-01-26
| | | |
* | | | kde5: rename plasma5 desktop moduleThomas Tuegel2015-01-26
| | | |
* | | | add NixOS module for Plasma desktopThomas Tuegel2015-01-26
| | | |
* | | | environment: set paths for Qt plugins and QMLThomas Tuegel2015-01-26
| | | |
* | | | Merge pull request #5982 from robberer/pkgs/openldapDomen Kožar2015-01-26
|\ \ \ \ | | | | | | | | | | openldap: add dataDir, use cfg.user and cfg.group to run slapd
| * | | | openldap: add dataDir, use cfg.user and cfg.group to run slapdLongrin Wischnewski2015-01-26
| | | | |
* | | | | openldap: correct directory hintDomen Kožar2015-01-26
| | | | |
* | | | | nixos/tests/chromium: Increase VM memory size.aszlig2015-01-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium is quite memory hungry and we frequently get random crashes in the tests, so let's set it to 1024 MB because new releases of Chromium most probably won't consume *less* memory. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | nixos/gitlab: Fix evaluation.aszlig2015-01-26
| | | | | | | | | | | | | | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | nixos/rabbitmq: fix moduleJaka Hudoklin2015-01-26
| | | | |
* | | | | nixos: disable gitlab test for nowCharles Strahan2015-01-25
| | | | |
* | | | | gitlab: fix evaluationCharles Strahan2015-01-25
| | | | |
* | | | | openldap: add example configDomen Kožar2015-01-25
| | | | |
* | | | | nixos/manual: Re-add development section.aszlig2015-01-25
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | I think this has been accidentally dropped by a099ca4, at least there is no reason stated, why it shouldn't be included, so I'm bringing it back. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | Merge pull request #5850 from edwtjo/kodi-pluginsEdward Tjörnhammar2015-01-24
|\ \ \ \ | | | | | | | | | | XBMC to Kodi migrations
| * | | | Add Kodi desktop-managerEdward Tjörnhammar2015-01-19
| | | | |
* | | | | Merge pull request #5593 from abbradar/modprobe-fixDomen Kožar2015-01-24
|\ \ \ \ \ | | | | | | | | | | | | modprobe: wrap all of kmod
| * | | | | nixos/modprobe: wrap all of kmodNikolay Amiantov2015-01-06
| | | | | |
* | | | | | Merge pull request #5531 from abbradar/tlpDomen Kožar2015-01-24
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | tlp: add package
| * | | | | nixos/tlp: add serviceNikolay Amiantov2015-01-24
| | | | | |
* | | | | | Merge pull request #5918 from robberer/openntpdEelco Dolstra2015-01-23
|\ \ \ \ \ \ | | | | | | | | | | | | | | openntpd: add extraConfig and extraOptions
| * | | | | | openntpd: add extraConfig and extraOptionsLongrin Wischnewski2015-01-23
| | | | | | |
* | | | | | | nixos/rename: Fix merging multiple destinations.aszlig2015-01-22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The renaming of options define the original value for the new attribute path. This works well if there is only *one* target, but if there are more, we end up recursing into the attribute set of the option definition itself. We now check for that within the parent recursion node (we can't check that from the subnode, because we lack that information about whether it's defined multiple times) and if the subnode consist entirely of a list of definitions, we use mkMerge on it. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
* | | | | | | Merge pull request #5499 from wizeman/u/zfs-dont-fsckwmertens2015-01-22
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | nixos: When generating /etc/fstab, ZFS and NFS filesystems shouldn't be checked
| * | | | | | | nixos: Don't do filesystem checks on ZFS or NFS filesystemsRicardo M. Correia2015-01-21
| | | | | | | |
* | | | | | | | Merge pull request #4677 from cstrahan/pleasant-rubyCharles Strahan2015-01-21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Pleasant ruby
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-rubyCharles Strahan2015-01-20
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/version-management/git-and-tools/default.nix pkgs/applications/version-management/git-and-tools/hub/default.nix pkgs/tools/audio/mpdcron/default.nix
| * | | | | | | | ruby: WIPCharles Strahan2014-12-30
| | | | | | | | |