summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into HEADJohn Ericson2018-11-05
|\
| * Merge pull request #49778 from gebner/rngd-versionGabriel Ebner2018-11-05
| |\
| | * nixos/rngd: do not pass --version flagGabriel Ebner2018-11-05
| * | Revert "NixOS tests: Wait for shell for 10x longer (50m)"Sarah Brofeldt2018-11-05
| |/
| * Merge pull request #47679 from NixOS/docs-make-channelMatthew Bauer2018-11-04
| |\
| | * Remove incorrect sentence from make-channel commentRobert Hensing2018-11-04
| | * Document make-channel.nixLinus Heckemann2018-10-02
| * | Merge pull request #49670 from matthewbauer/pkgs-i686-removeMatthew Bauer2018-11-04
| |\ \
| | * | treewide: remove pkgs_i686Matthew Bauer2018-11-03
| * | | Merge pull request #44303 from pvgoran/tomcat-clean-basedirMichael Raskin2018-11-04
| |\ \ \
| | * | | nixos/tomcat: add purifyOnStart optionPavel Goran2018-10-29
* | | | | Merge branch 'master' into stagingAustin Seipp2018-11-04
|\| | | |
| * | | | nixos/prometheus: check configuration before starting serviceAndreas Rammhold2018-11-04
| * | | | nixos/prometheus: add `package` optionAndreas Rammhold2018-11-04
| * | | | Merge pull request #49746 from NixOS/fix-nixos-bash-completion-commentRobert Hensing2018-11-04
| |\ \ \ \
| | * | | | nixos: programs.bash: Fix comment about completionRobert Hensing2018-11-04
| * | | | | Merge pull request #49283 from aanderse/solrAndreas Rammhold2018-11-04
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | solr: 4.10.3 -> 7.5.0, refactor service to reflect major changes in version b...Aaron Andersen2018-11-03
| * | | | | Merge pull request #49687 from gnidorah/swayMichael Weiss2018-11-04
| |\ \ \ \ \
| | * | | | | sway-beta module: add missing piecesgnidorah2018-11-03
| | | |_|/ / | | |/| | |
* | | | | | Merge branch 'master' into stagingAustin Seipp2018-11-03
|\| | | | |
| * | | | | gitlab module: fix config handlingRobin Gloster2018-11-04
| * | | | | Merge pull request #49620 from griff/rspamd-multifileJoachim F2018-11-03
| |\ \ \ \ \
| | * | | | | nixos/rspamd: Add support for included filesBrian Olsen2018-11-02
| * | | | | | nixos manual: Add changelog for consulNiklas Hambüchen2018-11-03
| * | | | | | consul: 0.9.3 -> 1.3.0.Niklas Hambüchen2018-11-03
| | |_|/ / / | |/| | | |
| * | | | | nixos/google-network-daemon: systemd job type simple instead of oneshot (#49692)Sarah Brofeldt2018-11-03
| * | | | | Merge pull request #49650 from srghma/srghma-patch-1Florian Klink2018-11-03
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | fix typoSergei Khoma2018-06-03
* | | | | | Merge staging into staging-nextFrederik Rietdijk2018-11-03
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into stagingAustin Seipp2018-11-02
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into stagingVladimír Čunát2018-11-02
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge staging-next into stagingFrederik Rietdijk2018-10-30
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into stagingTuomas Tynkkynen2018-10-27
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge staging-next into stagingFrederik Rietdijk2018-10-27
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | python3 is now python37 instead of python36Frederik Rietdijk2018-10-24
* | | | | | | | | | | Merge pull request #49658 from mayflower/gitlab-refactorFlorian Klink2018-11-03
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | gitlab: refactor and fix testRobin Gloster2018-11-02
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* / | | | | | | | | | nixos/dockerPreloader: preload docker images (#49379)lewo2018-11-03
|/ / / / / / / / / /
* | | | | | | | | | nixos/postgresql: add myself as maintainerAustin Seipp2018-11-02
* | | | | | | | | | nixos: fix #48917 by setting SYSTEMD_TIMEDATED_NTP_SERVICESAustin Seipp2018-11-02
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #47526 from rnhmjoj/syncthingJoachim F2018-11-02
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | nixos/syncthing: move configuration to condigDirrnhmjoj2018-10-15
* | | | | | | | | | nixos/tests/chromium: Fix sandbox info matchingaszlig2018-11-02
* | | | | | | | | | Merge pull request #49513 from dtzWill/fix/activation-nscd-pathWill Dietz2018-11-02
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | activation-script: add libc to path to provide nscd when neededWill Dietz2018-10-31
* | | | | | | | | | | nixos/zerotier: binds to network-online.target to avoid the 1m30s timeout bef...obadz2018-11-01
* | | | | | | | | | | nixos/kapacitor: new serviceSander van der Burg2018-11-01
* | | | | | | | | | | chromium tests: inherit timeout from the packageVladimír Čunát2018-11-01
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | home-assistant: use SIGINT instead of SIGTERM to shut down (#49571)Peter Hoeg2018-11-01