Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge pull request #5737 from ↵ | lethalman | 2015-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 description | Ryan Mulligan | 2015-01-12 |
| | | | | | | Maybe this wording is a slight improvement? | ||
| * | Add note that administrative public key for gitolite has to be written in ↵ | Matthias Beyer | 2015-01-12 |
| | | | | | | | | one line | ||
* | | Merge pull request #6045 from ragnard/apache-kafka | lethalman | 2015-01-30 |
|\ \ | | | | | | | apache-kafka: New package and service | ||
| * | | apache-kafka: New service for Apache Kafka | Ragnar Dahlén | 2015-01-29 |
| | | | |||
* | | | Merge PR #5772, boot.loader.timeout | Luca Bruno | 2015-01-30 |
|\ \ \ | |||
| * | | | nixos: gummiboot: change default to 1000 if boot.loader.timeout is null | Bob van der Linden | 2015-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 option | Bob van der Linden | 2015-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/nixpkgs | Shea Levy | 2015-01-30 |
|\ \ \ | |/ / |/| | | |||
| * | | nixos: Add tlsdated service | tv | 2015-01-21 |
| | | | |||
* | | | Merge pull request #5615 from nckx/freefall | lethalman | 2015-01-28 |
|\ \ \ | | | | | | | | | Add freefall: hard drive protection on HP/Dell laptops | ||
| * | | | Add freefall NixOS service module | Tobias Geerinckx-Rice | 2015-01-28 |
| | | | | |||
* | | | | Restrict the length of container names | Eelco Dolstra | 2015-01-28 |
| | | | | |||
* | | | | Merge pull request #5939 from ↵ | Jaka Hudoklin | 2015-01-28 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | offlinehacker/nixos/containers/containers_in_containers nixos/containers: make containers in containers possible | ||
| * | | | nixos/containers: make containers in containers possible | Jaka Hudoklin | 2015-01-28 |
| | | | | |||
* | | | | ntpd: Fork into the background | Eelco Dolstra | 2015-01-28 |
| | | | | | | | | | | | | | | | | | | | | With -n, ntpd will write log messages to both syslog and stderr, which is ugly. | ||
* | | | | nixos-rebuild: Update fallback code to update Nix | Eelco Dolstra | 2015-01-27 |
| | | | | |||
* | | | | Remove executable bits from non-executable files | Eelco Dolstra | 2015-01-27 |
| | | | | |||
* | | | | add stable attrs for plasma5, kf5, and kdeApps | Thomas Tuegel | 2015-01-26 |
| | | | | |||
* | | | | kde5: simplify package list | Thomas Tuegel | 2015-01-26 |
| | | | | |||
* | | | | kdm: install default backgrounds | Thomas Tuegel | 2015-01-26 |
| | | | | |||
* | | | | startkde: don't split script between NixOS module and package | Thomas Tuegel | 2015-01-26 |
| | | | | |||
* | | | | kde5: warn if enabled with kde4 | Thomas Tuegel | 2015-01-26 |
| | | | | |||
* | | | | kde5: rename plasma5 desktop module | Thomas Tuegel | 2015-01-26 |
| | | | | |||
* | | | | add NixOS module for Plasma desktop | Thomas Tuegel | 2015-01-26 |
| | | | | |||
* | | | | environment: set paths for Qt plugins and QML | Thomas Tuegel | 2015-01-26 |
| | | | | |||
* | | | | Merge pull request #5982 from robberer/pkgs/openldap | Domen Kožar | 2015-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 slapd | Longrin Wischnewski | 2015-01-26 |
| | | | | | |||
* | | | | | openldap: correct directory hint | Domen Kožar | 2015-01-26 |
| | | | | | |||
* | | | | | nixos/tests/chromium: Increase VM memory size. | aszlig | 2015-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. | aszlig | 2015-01-26 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: aszlig <aszlig@redmoonstudios.org> | ||
* | | | | | nixos/rabbitmq: fix module | Jaka Hudoklin | 2015-01-26 |
| | | | | | |||
* | | | | | nixos: disable gitlab test for now | Charles Strahan | 2015-01-25 |
| | | | | | |||
* | | | | | gitlab: fix evaluation | Charles Strahan | 2015-01-25 |
| | | | | | |||
* | | | | | openldap: add example config | Domen Kožar | 2015-01-25 |
| | | | | | |||
* | | | | | nixos/manual: Re-add development section. | aszlig | 2015-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-plugins | Edward Tjörnhammar | 2015-01-24 |
|\ \ \ \ | | | | | | | | | | | XBMC to Kodi migrations | ||
| * | | | | Add Kodi desktop-manager | Edward Tjörnhammar | 2015-01-19 |
| | | | | | |||
* | | | | | Merge pull request #5593 from abbradar/modprobe-fix | Domen Kožar | 2015-01-24 |
|\ \ \ \ \ | | | | | | | | | | | | | modprobe: wrap all of kmod | ||
| * | | | | | nixos/modprobe: wrap all of kmod | Nikolay Amiantov | 2015-01-06 |
| | | | | | | |||
* | | | | | | Merge pull request #5531 from abbradar/tlp | Domen Kožar | 2015-01-24 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | tlp: add package | ||
| * | | | | | nixos/tlp: add service | Nikolay Amiantov | 2015-01-24 |
| | | | | | | |||
* | | | | | | Merge pull request #5918 from robberer/openntpd | Eelco Dolstra | 2015-01-23 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | openntpd: add extraConfig and extraOptions | ||
| * | | | | | | openntpd: add extraConfig and extraOptions | Longrin Wischnewski | 2015-01-23 |
| | | | | | | | |||
* | | | | | | | nixos/rename: Fix merging multiple destinations. | aszlig | 2015-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-fsck | wmertens | 2015-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 filesystems | Ricardo M. Correia | 2015-01-21 |
| | | | | | | | | |||
* | | | | | | | | Merge pull request #4677 from cstrahan/pleasant-ruby | Charles Strahan | 2015-01-21 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Pleasant ruby | ||
| * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-ruby | Charles Strahan | 2015-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: WIP | Charles Strahan | 2014-12-30 |
| | | | | | | | | |