Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into staging | Thomas Tuegel | 2015-04-29 |
|\ | |||
| * | Work around infinite recursion issue in nixops. | Rob Vermaas | 2015-04-29 |
| | | |||
| * | Merge pull request #7605 from ip1981/wiki | Arseniy Seroka | 2015-04-28 |
| |\ | | | | | | | Mediawiki updates | ||
| | * | Mediawiki 1.23.9 | Igor Pashev | 2015-04-28 |
| | | | |||
| | * | Apache servedFiles: fixed a typo in example | Igor Pashev | 2015-04-28 |
| | | | |||
| | * | wiki: do not rewrite served files | Igor Pashev | 2015-04-28 |
| | | | |||
| * | | nixos.system_tarball_pc: Fix evaluation | Ricardo M. Correia | 2015-04-28 |
| | | | | | | | | | | | | | | | | | | It was broken due to 57b05765c968c1ad5245c59513d11d679ed7130d. ZFS requires `networking.hostId` to be set. | ||
| * | | i2p: add service to module-list | Herwig Hochleitner | 2015-04-28 |
| | | | |||
| * | | Merge pull request #7545 from offlinehacker/pkgs/kubernetes/fixes | Jaka Hudoklin | 2015-04-28 |
| |\ \ | | | | | | | | | kubernetes: update to 0.15, module fixes | ||
| | * | | nixos/kubernetes: fix module | Jaka Hudoklin | 2015-04-25 |
| | | | | |||
| * | | | Merge pull request #7555 from offlinehacker/nixos/nginx/reload | Jaka Hudoklin | 2015-04-28 |
| |\ \ \ | | | | | | | | | | | nixos/nginx: enable service/config reload | ||
| | * | | | nixos/nginx: enable service/config reload | Jaka Hudoklin | 2015-04-25 |
| | |/ / | |||
| * | | | Merge pull request #7549 from offlinehacker/nixos/ripple-data-api/importmode | Jaka Hudoklin | 2015-04-28 |
| |\ \ \ | | | | | | | | | | | nixos/ripple-data-api: add import mode option | ||
| | * | | | nixos/ripple-data-api: add import mode option | Jaka Hudoklin | 2015-04-25 |
| | |/ / | |||
| * | | | nixos-install: Fix chroot flag not defaulting to Bash outside NixOS. | Jookia | 2015-04-28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing the chroot flag to nixos-install without arguments should now give you a Bash shell as intended rather than try an empty path. This was masked by the user's shell (usually /bin/bash) being defaulted to by chroot, and being found since their paths used NixOS conventions. | ||
| * | | | nixos-install: Fix password prompt failing outside NixOS. | Jookia | 2015-04-28 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | When bootstrapping from other distributions, nixos-install is unable to find various tools in the chroot since their paths aren't aware of NixOS conventions. This makes a small change to existing code by specifying nixpkgs/nixos instead of just nixos when running nix-instantiate in the chroot. I haven't tested this outside of bootstrapping, but the same specification is used elsewhere in the code so I don't see why it wouldn't work. | ||
| * | | Remove redundant i18n.supportedLocales setting | Eelco Dolstra | 2015-04-27 |
| | | | | | | | | | | | | | | | | | | This is already set in profiles/minimal.nix. Probably fixes #7589. | ||
| * | | Don't require sslServerChain to be set | Eelco Dolstra | 2015-04-27 |
| | | | |||
| * | | Merge pull request #7486 from oxij/actkbd-and-media-keys | lethalman | 2015-04-27 |
| |\ \ | | | | | | | | | add actkbd; nixos: add support for volume control with media keys | ||
| | * | | nixos: add actkbd module and sound.enableMediaKeys option | Jan Malakhovski | 2015-04-20 |
| | | | | |||
* | | | | gnome3: move definition of package sets into pkgs | Herwig Hochleitner | 2015-04-28 |
| | | | | |||
* | | | | Merge 'master' into staging | Vladimír Čunát | 2015-04-26 |
|\| | | | | | | | | | | | | | | | (relatively simple conflicts) | ||
| * | | | Merge pull request #7548 from offlinehacker/etcdfix | Domen Kožar | 2015-04-25 |
| |\ \ \ | | | | | | | | | | | nixos/etcd: fix enable type, so it could be enabled on multiple places | ||
| | * | | | nixos/etcd: fix enable type, so it could be enabled on multiple places | Jaka Hudoklin | 2015-04-25 |
| | | |/ | | |/| | |||
| * | | | Merge pull request #7546 from offlinehacker/nixos/panamax/reload | Jaka Hudoklin | 2015-04-25 |
| |\ \ \ | | | | | | | | | | | nixos/fluentd: add support for config reload | ||
| | * | | | nixos/fluentd: add support for config reload | Jaka Hudoklin | 2015-04-25 |
| | |/ / | |||
| * | | | Merge pull request #7550 from offlinehacker/nixos/rippled/changes | Jaka Hudoklin | 2015-04-25 |
| |\ \ \ | | | | | | | | | | | nixos/rippled: new options, fixes | ||
| | * | | | nixos/rippled: new options, fixes | Jaka Hudoklin | 2015-04-25 |
| | |/ / | |||
| * | | | nixos: fix cjdns json config | Emery Hemingway | 2015-04-25 |
| | | | | | | | | | | | | | | | | filter extraneous attributes from config modules | ||
| * | | | Merge pull request #7498 from k0ral/sslh | Edward Tjörnhammar | 2015-04-23 |
| |\ \ \ | | | | | | | | | | | sslh: argument to -F can no longer be separated from the option by a space | ||
| | * | | | sslh: argument to -F can no longer be separated from the option by a space | koral | 2015-04-21 |
| | | | | | |||
| * | | | | Add hologram service | Dan Peebles | 2015-04-23 |
| | | | | | |||
| * | | | | wait for filesystem before starting btsync; bump to latest package version | Oliver Matthews | 2015-04-23 |
| | | | | | |||
| * | | | | manual: re-add running nixos tests sections | Domen Kožar | 2015-04-21 |
| | | | | | |||
| * | | | | Fix #7354 - Accept _module attributes added to every submodule. | Nicolas B. Pierron | 2015-04-20 |
| | | | | | |||
| * | | | | lambdabot: add named pipe for incoming commands | Nikolay Amiantov | 2015-04-20 |
| | |_|/ | |/| | | |||
| * | | | Typo | Eelco Dolstra | 2015-04-20 |
| | | | | |||
| * | | | Grmbl | Eelco Dolstra | 2015-04-20 |
| | | | | |||
| * | | | ntfs.nix: Remove copypasta jfs stuff | Eelco Dolstra | 2015-04-20 |
| | | | | | | | | | | | | | | | | Thanks to @wizeman for spotting this! | ||
| * | | | Use "mkdir -p" when creating ~/.nix-defexpr | Eelco Dolstra | 2015-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, simultaneous invocations of /etc/profile can fail, e.g. mkdir: cannot create directory ‘/.nix-defexpr’: File exists | ||
| * | | | Remove sysvtools from the system path | Eelco Dolstra | 2015-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | All programs in sysvtools (except killall5) are also provided by util-linux or procps. Issue #7117. | ||
| * | | | Fix #7476 | Eelco Dolstra | 2015-04-20 |
| | | | | |||
| * | | | minimal.nix: Get rid of most Glibc locales | Eelco Dolstra | 2015-04-20 |
| | | | | | | | | | | | | | | | | | | | | | | | | This cuts ~100 MB from the system closure. Issue #7117. | ||
| * | | | Disable some more unnecessary stuff in containers | Eelco Dolstra | 2015-04-20 |
| | | | | |||
| * | | | stage-2-init: Don't depend on sysvtools | Eelco Dolstra | 2015-04-20 |
| | | | | |||
| * | | | Remove obsolete "eject" entry from the system path | Eelco Dolstra | 2015-04-20 |
| | | | | | | | | | | | | | | | | It's an alias for util-linux, so included anyway. | ||
| * | | | Remove pciutils and usbutils from the default system path | Eelco Dolstra | 2015-04-20 |
| | | | | | | | | | | | | | | | | Issue #7117. | ||
| * | | | fix rebuild when using ntfs partitions | Cray Elliott | 2015-04-19 |
| | | | | | | | | | | | | | | | | needed to define inInitrd, used vfat.nix as a template | ||
| * | | | Include cifs-utils only when needed | Eelco Dolstra | 2015-04-19 |
| | | | | | | | | | | | | | | | | Issue #7117. | ||
| * | | | container.nix -> docker-container.nix | Eelco Dolstra | 2015-04-19 |
| | | | |