summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-06
|\
| * Merge pull request #8629 from telotortium/subsonicArseniy Seroka2015-07-07
| |\
| | * subsonic service: initRobert Irelan2015-07-05
| * | Merge pull request #8656 from devhell/udisks2.serviceWilliam A. Kennington III2015-07-06
| |\ \
| | * | udisks2 service: Fix ExecStart pathdevhell2015-07-05
* | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-05
|\| | |
| * | | nixos/installer: Add grub2_efi to the store so that it is available to installWilliam A. Kennington III2015-07-05
* | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-05
|\| | |
| * | | nixos/install-grub: Fix symlink installation for boot filesystems which don't...William A. Kennington III2015-07-05
| | |/ | |/|
| * | nixos/quassel: Temporarily switch back to qt4 since qt5 tls in quassel is brokenWilliam A. Kennington III2015-07-05
* | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-05
|\| |
| * | grub installation: fix: simplify codeThomas Strobel2015-07-05
| |/
| * Merge pull request #8654 from ts468/upstream.trusted_grub_integrationWilliam A. Kennington III2015-07-05
| |\
| | * grub installation: integrate trustedGRUB + fix broken equality checkThomas Strobel2015-07-05
| * | nixos docker: fix service and testLuca Bruno2015-07-05
| |/
| * Merge pull request #8602 from ts468/upstream.pamlethalman2015-07-05
| |\
| | * pam_mount module: integrate pam_mount into PAM of NixOSThomas Strobel2015-07-04
| * | Merge pull request #8603 from ts468/upstream.xenMateusz Kowalczyk2015-07-04
| |\ \
| | * | Xen Dom0: add dnsmasq to xen-bridge.Thomas Strobel2015-07-02
| * | | Merge pull request #8554 from dwe11er/luks-detached-headerlethalman2015-07-04
| |\ \ \
| | * | | nixos/modules/system/boot/luksroot.nix: allow for LUKS devices with detached ...Marcin Falkiewicz2015-06-29
| * | | | Merge pull request #8573 from lihop/shellinabox-serviceArseniy Seroka2015-07-04
| |\ \ \ \
| | * | | | shellinabox service: intial implementationLeroy Hopson2015-07-04
| * | | | | Merge pull request #8624 from ambrop72/minidlna-updateArseniy Seroka2015-07-04
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | minidlna: 1.0.25 -> 1.1.4Ambroz Bizjak2015-07-04
| * | | | | nixos/skydns: fixed reference to skydnsPascal Wittmann2015-07-04
| * | | | | nixos/tests/chromium: Improve sandbox checking.aszlig2015-07-04
| |/ / / /
| * | | / wordpress: language downloads are now reproducibleJoachim Schiele2015-07-03
| | |_|/ | |/| |
| * | | nixos/postgresql: Fix initdb for existing, empty postgres partitionsWilliam A. Kennington III2015-07-02
* | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-07-01
|\| | |
| * | | Merge remote-tracking branch 'projectorhq/riemann-tools'Shea Levy2015-07-01
| |\ \ \
| | * | | Add riemann-tools to nixpkgsRobert Pitts and Trenton Strong2015-06-30
| * | | | Use mkAfter for services.postgresql.authenticationEelco Dolstra2015-07-01
* | | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-30
|\| | | |
| * | | | nixos: gnome-keyring: fix module descriptionTobias Geerinckx-Rice2015-07-01
| * | | | Remove option ec2.metadataEelco Dolstra2015-06-30
| * | | | EC2: Don't blackhole 169.254.169.254Eelco Dolstra2015-06-30
| * | | | nix.buildMachines: Fewer required fieldsEelco Dolstra2015-06-30
| | |/ / | |/| |
| * | | nixos/iso-image: Allow to customize menu label.aszlig2015-06-28
| * | | nixos: added gitit serviceEdward Tjörnhammar2015-06-28
* | | | krb5: Break out into a lib and not lib versionWilliam A. Kennington III2015-06-26
* | | | Merge branch 'master.upstream' into staging.upstreamWilliam A. Kennington III2015-06-26
|\| | |
| * | | nixos: Replace pkgs.openssh with config.programs.ssh.packageWilliam A. Kennington III2015-06-26
| * | | Add options nix.{trustedUsers,allowedUsers}Eelco Dolstra2015-06-26
| * | | nix.buildMachines: Don't require sshUserEelco Dolstra2015-06-26
| * | | Merge pull request #8520 from hrdinka/fix/postfix-recipient_delimiterPeter Simons2015-06-26
| |\ \ \
| | * | | postfix: fix recipient_delimiter optionChristoph Hrdinka2015-06-26
| * | | | Merge pull request #8484 from DamienCassou/fix-blocking-stumpwm-moduleDamien Cassou2015-06-26
| |\ \ \ \
| | * | | | stumpwm: don't block after starting stumpwmDamien Cassou2015-06-26
| * | | | | wordpress: usability updatesJoachim Schiele2015-06-25