Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into HEAD | John Ericson | 2018-11-05 |
|\ | |||
| * | Merge pull request #49778 from gebner/rngd-version | Gabriel Ebner | 2018-11-05 |
| |\ | |||
| | * | nixos/rngd: do not pass --version flag | Gabriel Ebner | 2018-11-05 |
| * | | Revert "NixOS tests: Wait for shell for 10x longer (50m)" | Sarah Brofeldt | 2018-11-05 |
| |/ | |||
| * | Merge pull request #47679 from NixOS/docs-make-channel | Matthew Bauer | 2018-11-04 |
| |\ | |||
| | * | Remove incorrect sentence from make-channel comment | Robert Hensing | 2018-11-04 |
| | * | Document make-channel.nix | Linus Heckemann | 2018-10-02 |
| * | | Merge pull request #49670 from matthewbauer/pkgs-i686-remove | Matthew Bauer | 2018-11-04 |
| |\ \ | |||
| | * | | treewide: remove pkgs_i686 | Matthew Bauer | 2018-11-03 |
| * | | | Merge pull request #44303 from pvgoran/tomcat-clean-basedir | Michael Raskin | 2018-11-04 |
| |\ \ \ | |||
| | * | | | nixos/tomcat: add purifyOnStart option | Pavel Goran | 2018-10-29 |
* | | | | | Merge branch 'master' into staging | Austin Seipp | 2018-11-04 |
|\| | | | | |||
| * | | | | nixos/prometheus: check configuration before starting service | Andreas Rammhold | 2018-11-04 |
| * | | | | nixos/prometheus: add `package` option | Andreas Rammhold | 2018-11-04 |
| * | | | | Merge pull request #49746 from NixOS/fix-nixos-bash-completion-comment | Robert Hensing | 2018-11-04 |
| |\ \ \ \ | |||
| | * | | | | nixos: programs.bash: Fix comment about completion | Robert Hensing | 2018-11-04 |
| * | | | | | Merge pull request #49283 from aanderse/solr | Andreas Rammhold | 2018-11-04 |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | |||
| | * | | | | solr: 4.10.3 -> 7.5.0, refactor service to reflect major changes in version b... | Aaron Andersen | 2018-11-03 |
| * | | | | | Merge pull request #49687 from gnidorah/sway | Michael Weiss | 2018-11-04 |
| |\ \ \ \ \ | |||
| | * | | | | | sway-beta module: add missing pieces | gnidorah | 2018-11-03 |
| | | |_|/ / | | |/| | | | |||
* | | | | | | Merge branch 'master' into staging | Austin Seipp | 2018-11-03 |
|\| | | | | | |||
| * | | | | | gitlab module: fix config handling | Robin Gloster | 2018-11-04 |
| * | | | | | Merge pull request #49620 from griff/rspamd-multifile | Joachim F | 2018-11-03 |
| |\ \ \ \ \ | |||
| | * | | | | | nixos/rspamd: Add support for included files | Brian Olsen | 2018-11-02 |
| * | | | | | | nixos manual: Add changelog for consul | Niklas Hambüchen | 2018-11-03 |
| * | | | | | | consul: 0.9.3 -> 1.3.0. | Niklas Hambüchen | 2018-11-03 |
| | |_|/ / / | |/| | | | | |||
| * | | | | | nixos/google-network-daemon: systemd job type simple instead of oneshot (#49692) | Sarah Brofeldt | 2018-11-03 |
| * | | | | | Merge pull request #49650 from srghma/srghma-patch-1 | Florian Klink | 2018-11-03 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||
| | * | | | | fix typo | Sergei Khoma | 2018-06-03 |
* | | | | | | Merge staging into staging-next | Frederik Rietdijk | 2018-11-03 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | |||
| * | | | | | Merge branch 'master' into staging | Austin Seipp | 2018-11-02 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'master' into staging | Vladimír Čunát | 2018-11-02 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge staging-next into staging | Frederik Rietdijk | 2018-10-30 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' into staging | Tuomas Tynkkynen | 2018-10-27 |
| |\ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ | Merge staging-next into staging | Frederik Rietdijk | 2018-10-27 |
| |\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | python3 is now python37 instead of python36 | Frederik Rietdijk | 2018-10-24 |
* | | | | | | | | | | | Merge pull request #49658 from mayflower/gitlab-refactor | Florian Klink | 2018-11-03 |
|\ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | gitlab: refactor and fix test | Robin Gloster | 2018-11-02 |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | |||
* / | | | | | | | | | | nixos/dockerPreloader: preload docker images (#49379) | lewo | 2018-11-03 |
|/ / / / / / / / / / | |||
* | | | | | | | | | | nixos/postgresql: add myself as maintainer | Austin Seipp | 2018-11-02 |
* | | | | | | | | | | nixos: fix #48917 by setting SYSTEMD_TIMEDATED_NTP_SERVICES | Austin Seipp | 2018-11-02 |
| |_|_|_|/ / / / / |/| | | | | | | | | |||
* | | | | | | | | | Merge pull request #47526 from rnhmjoj/syncthing | Joachim F | 2018-11-02 |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | nixos/syncthing: move configuration to condigDir | rnhmjoj | 2018-10-15 |
* | | | | | | | | | | nixos/tests/chromium: Fix sandbox info matching | aszlig | 2018-11-02 |
* | | | | | | | | | | Merge pull request #49513 from dtzWill/fix/activation-nscd-path | Will Dietz | 2018-11-02 |
|\ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | activation-script: add libc to path to provide nscd when needed | Will Dietz | 2018-10-31 |
* | | | | | | | | | | | nixos/zerotier: binds to network-online.target to avoid the 1m30s timeout bef... | obadz | 2018-11-01 |
* | | | | | | | | | | | nixos/kapacitor: new service | Sander van der Burg | 2018-11-01 |
* | | | | | | | | | | | chromium tests: inherit timeout from the package | Vladimír Čunát | 2018-11-01 |
| |_|_|_|_|_|_|/ / / |/| | | | | | | | | | |||
* | | | | | | | | | | home-assistant: use SIGINT instead of SIGTERM to shut down (#49571) | Peter Hoeg | 2018-11-01 |