Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2020-04-18 |
|\ | |||
| * | Merge pull request #83755 from jtojnar/jcat-0.1 | Jan Tojnar | 2020-04-18 |
| |\ | |||
| | * | libjcat: init at 0.1.1 | Jan Tojnar | 2020-04-15 |
| * | | Merge pull request #83166 from avnik/nix-build-location | Jörg Thalheim | 2020-04-18 |
| |\ \ | |||
| | * | | nixos: Introduce nix.buildLocation option | Alexander V. Nikolaev | 2020-04-18 |
| * | | | Merge pull request #85365 from immae/fix_acme_postrun | worldofpeace | 2020-04-18 |
| |\ \ \ | |||
| | * | | | nixos/acme: Fix postRun in acme certificate being ran at every run | Ismaël Bouya | 2020-04-17 |
| * | | | | nixos/rss2email: globally install rss2email | Alyssa Ross | 2020-04-18 |
| * | | | | treewide: per RFC45, remove more unquoted URLs | Pavol Rusnak | 2020-04-18 |
| * | | | | manual/rl-2009.xml: fix build (#85478) | Edmund Wu | 2020-04-18 |
* | | | | | Merge branch 'master' of github.com:NixOS/nixpkgs into staging | John Ericson | 2020-04-18 |
|\| | | | | |||
| * | | | | nixos/deluge: support 2.x | Milan Pässler | 2020-04-18 |
| | |/ / | |/| | | |||
* | | | | Merge remote-tracking branch 'upstream/master' into staging | John Ericson | 2020-04-17 |
|\| | | | |||
| * | | | nixos/k3s: add initial k3s service | Euan Kemp | 2020-04-17 |
| * | | | mopidy: Create a mopidyPackages set | adisbladis | 2020-04-17 |
| * | | | Merge pull request #85341 from Ma27/bump-hydra | Maximilian Bosch | 2020-04-16 |
| |\ \ \ | |||
| | * | | | nixos/tests: fix inclusion of hydra test | Maximilian Bosch | 2020-04-16 |
| * | | | | Merge pull request #85004 from emilazy/add-initrd-secrets-path-assertion | Yegor Timoshenko | 2020-04-16 |
| |\ \ \ \ | |||
| | * | | | | nixos/stage-1: check secret paths before copying | Emily | 2020-04-11 |
| | * | | | | nixos/initrd-ssh: fix typo in docs | Emily | 2020-04-11 |
| * | | | | | Merge pull request #85332 from arianvp/revert-acme | worldofpeace | 2020-04-16 |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | |||
| | * | | | | Revert "nixos/acme: Fix allowKeysForGroup not applying immediately" | Arian van Putten | 2020-04-16 |
| * | | | | | nixos/doc: fix database-setup example for matrix-synapse | Maximilian Bosch | 2020-04-16 |
| | |_|/ / | |/| | | | |||
* | | | | | Merge branch 'staging-next' into staging | Jan Tojnar | 2020-04-16 |
|\ \ \ \ \ | |||
| * | | | | | Merge branch 'master' into staging-next | Jan Tojnar | 2020-04-16 |
| |\| | | | | |||
| | * | | | | Merge pull request #84266 from Ma27/nspawn-overrides | Maximilian Bosch | 2020-04-16 |
| | |\ \ \ \ | |||
| | | * | | | | nixos/systemd-nspawn: disallow multiple packages with `.nspawn`-units | Maximilian Bosch | 2020-04-04 |
| | * | | | | | Merge pull request #82339 from Ma27/captive-browser-xdg | Maximilian Bosch | 2020-04-16 |
| | |\ \ \ \ \ | |||
| | | * | | | | | nixos/captive-browser: set chromium's data-dir to a XDG-compliant location | Maximilian Bosch | 2020-03-11 |
| | * | | | | | | Merge pull request #85252 from flokli/nixos-flannel-fix | Florian Klink | 2020-04-15 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | nixosTests.flannel: port to python, unbreak | Florian Klink | 2020-04-14 |
| | * | | | | | | | Merge pull request #85162 from Ma27/build-vms-file-loc | Maximilian Bosch | 2020-04-15 |
| | |\ \ \ \ \ \ \ | |||
| | | * | | | | | | | nixos/build-vms: propagate file location | Maximilian Bosch | 2020-04-13 |
| | * | | | | | | | | Merge pull request #78129 from flyfloh/airsonic-vhost | Michele Guerini Rocco | 2020-04-15 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | |||
| | | * | | | | | | | airsonic: enable nginx.recommendedProxySettings with virtualHost | Florian | 2020-02-28 |
| | * | | | | | | | | Merge pull request #83362 from bachp/boinc | Matthew Bauer | 2020-04-14 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | |||
| | | * | | | | | | | nixos/boinc: create boinc group | Pascal Bach | 2020-03-25 |
| | | * | | | | | | | nixos/boinc: log to journal instead of log file | Pascal Bach | 2020-03-25 |
| | * | | | | | | | | Merge pull request #85165 from mayflower/alertmanager-clustering | Maximilian Bosch | 2020-04-14 |
| | |\ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | alertmanager: implement HA clustering support | Robin Gloster | 2020-04-13 |
| | * | | | | | | | | | Merge pull request #85222 from mayflower/libinput-manual-ref | worldofpeace | 2020-04-14 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | nixos/libinput: refer to libinput manual | Linus Heckemann | 2020-04-14 |
| | * | | | | | | | | | | Merge pull request #84255 from prikhi/lightdm-mini-greeter-040 | worldofpeace | 2020-04-14 |
| | |\ \ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | | lightdm-mini-greeter: 0.3.4 -> 0.4.0 | Pavan Rikhi | 2020-04-04 |
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | | | |||
| | * | | | | | | | | | | nixos/dysnomia: fix documentRoot property | Sander van der Burg | 2020-04-14 |
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | | | |||
| | * | | | | | | | | | Merge pull request #85170 from flokli/networking-virtual | Michele Guerini Rocco | 2020-04-14 |
| | |\ \ \ \ \ \ \ \ \ | |||
| | | * | | | | | | | | | nixosTests.networking: test setting MTU and MAC Address | Florian Klink | 2020-04-13 |
| | | * | | | | | | | | | nixosTests.networking.virtual: fix with networkd | Florian Klink | 2020-04-13 |
| | | * | | | | | | | | | nixosTests.networking: make routing table comparison more reliable | Florian Klink | 2020-04-13 |
| | | * | | | | | | | | | nixos/networking: move network-link-${i.name} to scripted networking | Florian Klink | 2020-04-13 |