about summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* 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
| | | | | | | |
| * | | | | | | Merge branch 'master' of github.com:nixos/nixpkgs into pleasant-rubyCharles Strahan2014-12-28
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: pkgs/applications/version-management/redmine/default.nix pkgs/development/interpreters/ruby/gem.nix pkgs/development/interpreters/ruby/generated.nix pkgs/development/interpreters/ruby/patches.nix pkgs/development/tools/vagrant/default.nix pkgs/servers/consul/default.nix
| * | | | | | | | redmine: fix use of bundlerCharles Strahan2014-12-28
| | | | | | | | |
| * | | | | | | | bundixify riemann-dashCharles Strahan2014-11-18
| | | | | | | | |
| * | | | | | | | more rubyLibs renamingCharles Strahan2014-11-12
| | | | | | | | |
* | | | | | | | | owncloud: make .htaccess availableMatej Cotman2015-01-21
| | | | | | | | |
* | | | | | | | | apache-httpd: add owncloudMatej Cotman2015-01-21
| | | | | | | | |
* | | | | | | | | apache-httpd: add restartSec optionMatej Cotman2015-01-21
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Fix release notesEelco Dolstra2015-01-21
| |_|/ / / / / |/| | | | | |
* | | | | | | grsecurity: Add `denyUSB` option to grsec NixOS moduleRicardo M. Correia2015-01-20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The option had been added to the grsec build-support code, but it hadn't been added to the grsec module. After this commit, grsec module users will be able to change the default value. It also serves to document that this option exists and that NixOS will disable it by default.
* | | | | | | firewall service: fix pingLimit example valueJoachim Fasting2015-01-20
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | The example uses single dashes, whereas iptables requires double dashes.
* | | | | | Merge pull request #5517 from paraseba/bumblebeelethalman2015-01-19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bumblebee config to enable multiple monitors
| * | | | | | Bumblebee config to enable multiple monitorsSebastián Bernardo Galkin2014-12-30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added configurations to `bumblebee` package to easy multiple monitors on Optimus machines. The behaviour of the default `bumblebee` package hasn't change, so this change is backwards compatible. Users who want to connect a monitor to their discrete card should use the package `bumblebee_display` instead. Also added new configuration option to nixos bumblebee module: ``` hardware.bumblebee.connectDisplay = true ``` will enable the new configuration, but the default is still false.
* | | | | | | Merge pull request #4394 from wmertens/patch-6wmertens2015-01-19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | setup-etc.pl: Fail when symlink/rename fails
| * | | | | | | setup-etc.pl: Fail when symlink/rename failswmertens2014-10-06
| | | | | | | | | | | | | | | | | | | | | | | | When atomicSymlink can't symlink or rename, it should return failure. This is then handled with `... or die` and `... or warn`
* | | | | | | | Merge pull request #5849 from robberer/systemd/restartassertlethalman2015-01-19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | systemd: extend checkUnitConfig with on-abnormal
| * | | | | | | | systemd: extend checkUnitConfig with on-abnormalLongrin Wischnewski2015-01-19
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | nixos/dovecot: added configFile option and default Restart on-failure, PR #5845Andrey Arapov2015-01-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absolute path is required when one has such postfix configuration where he/she needs to specify the actual (real) path to active dovecot config. Without this commit applied, the dovecot is running in such way: /nix/store/hashAAA-dovecot-ver/sbin/dovecot -F -c /nix/store/hashBBB-dovecot2.conf and postfix can't be aware of the value of "hashBBB" via services.postfix.extraConfig = '' ... ''; (it can only be aware of "hashAAA" with ${pkgs.dovecot} parameter) Also enable Restart on-failure. Edit: set RestartSec to 1s
* | | | | | | | nixos/sync-server: Respect the enable optionWilliam A. Kennington III2015-01-18
| | | | | | | |
* | | | | | | | Merge pull request #5301 from nbp/syncserverDomen Kožar2015-01-18
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Add Firefox Sync service
| * | | | | | | Improve the documentation of the syncserver module.Nicolas B. Pierron2015-01-18
| | | | | | | |
| * | | | | | | Change default syncserver listen.port to a safer one.Nicolas B. Pierron2015-01-18
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into syncserverNicolas B. Pierron2014-12-14
| |\ \ \ \ \ \ \
| * | | | | | | | Firefox Sync Server: Create the private config file as non-world readable.Nicolas B. Pierron2014-12-12
| | | | | | | | |
| * | | | | | | | Firefox Sync Server: Fix copy&paste issue.Nicolas B. Pierron2014-12-12
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'origin/master' into syncserverNicolas B. Pierron2014-12-11
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add Firefox Sync server module.Nicolas B. Pierron2014-12-11
| | | | | | | | | |
* | | | | | | | | | Merge pull request #5726 from spwhitt/zsh-command-not-foundDomen Kožar2015-01-17
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | command-not-found: Add ZSH Support
| * | | | | | | | | | command-not-found: Add ZSH SupportSpencer Whitt2015-01-12
| | | | | | | | | | |
* | | | | | | | | | | Create a nixos module for cups-browsedDamien Cassou2015-01-16
| | | | | | | | | | |
* | | | | | | | | | | ParanoiaEelco Dolstra2015-01-15
| | | | | | | | | | |
* | | | | | | | | | | nixos-install: Create /root with 700 permissionEelco Dolstra2015-01-15
| | | | | | | | | | |
* | | | | | | | | | | NixOS containers: Create /root with 700 permissionEelco Dolstra2015-01-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Systemd-nspawn creates /root with 755 permission if it doesn't exist, which is bad. So we have to create it ourselves before calling systemd-nspawn.
* | | | | | | | | | | test-instrumentation.nix: Prevent calling a pagerEelco Dolstra2015-01-15
| | | | | | | | | | |
* | | | | | | | | | | nixos: adding nylon service with uid,gidEdward Tjörnhammar2015-01-14
| | | | | | | | | | |
* | | | | | | | | | | nixos/network-interfaces: Fix rstp supportWilliam A. Kennington III2015-01-14
| | | | | | | | | | |
* | | | | | | | | | | pam: add pam_wheelLuca Bruno2015-01-14
| | | | | | | | | | |