summary refs log tree commit diff
path: root/nixos
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2020-04-18
|\
| * Merge pull request #83755 from jtojnar/jcat-0.1Jan Tojnar2020-04-18
| |\
| | * libjcat: init at 0.1.1Jan Tojnar2020-04-15
| * | Merge pull request #83166 from avnik/nix-build-locationJörg Thalheim2020-04-18
| |\ \
| | * | nixos: Introduce nix.buildLocation optionAlexander V. Nikolaev2020-04-18
| * | | Merge pull request #85365 from immae/fix_acme_postrunworldofpeace2020-04-18
| |\ \ \
| | * | | nixos/acme: Fix postRun in acme certificate being ran at every runIsmaël Bouya2020-04-17
| * | | | nixos/rss2email: globally install rss2emailAlyssa Ross2020-04-18
| * | | | treewide: per RFC45, remove more unquoted URLsPavol Rusnak2020-04-18
| * | | | manual/rl-2009.xml: fix build (#85478)Edmund Wu2020-04-18
* | | | | Merge branch 'master' of github.com:NixOS/nixpkgs into stagingJohn Ericson2020-04-18
|\| | | |
| * | | | nixos/deluge: support 2.xMilan Pässler2020-04-18
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'upstream/master' into stagingJohn Ericson2020-04-17
|\| | |
| * | | nixos/k3s: add initial k3s serviceEuan Kemp2020-04-17
| * | | mopidy: Create a mopidyPackages setadisbladis2020-04-17
| * | | Merge pull request #85341 from Ma27/bump-hydraMaximilian Bosch2020-04-16
| |\ \ \
| | * | | nixos/tests: fix inclusion of hydra testMaximilian Bosch2020-04-16
| * | | | Merge pull request #85004 from emilazy/add-initrd-secrets-path-assertionYegor Timoshenko2020-04-16
| |\ \ \ \
| | * | | | nixos/stage-1: check secret paths before copyingEmily2020-04-11
| | * | | | nixos/initrd-ssh: fix typo in docsEmily2020-04-11
| * | | | | Merge pull request #85332 from arianvp/revert-acmeworldofpeace2020-04-16
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Revert "nixos/acme: Fix allowKeysForGroup not applying immediately"Arian van Putten2020-04-16
| * | | | | nixos/doc: fix database-setup example for matrix-synapseMaximilian Bosch2020-04-16
| | |_|/ / | |/| | |
* | | | | Merge branch 'staging-next' into stagingJan Tojnar2020-04-16
|\ \ \ \ \
| * | | | | Merge branch 'master' into staging-nextJan Tojnar2020-04-16
| |\| | | |
| | * | | | Merge pull request #84266 from Ma27/nspawn-overridesMaximilian Bosch2020-04-16
| | |\ \ \ \
| | | * | | | nixos/systemd-nspawn: disallow multiple packages with `.nspawn`-unitsMaximilian Bosch2020-04-04
| | * | | | | Merge pull request #82339 from Ma27/captive-browser-xdgMaximilian Bosch2020-04-16
| | |\ \ \ \ \
| | | * | | | | nixos/captive-browser: set chromium's data-dir to a XDG-compliant locationMaximilian Bosch2020-03-11
| | * | | | | | Merge pull request #85252 from flokli/nixos-flannel-fixFlorian Klink2020-04-15
| | |\ \ \ \ \ \
| | | * | | | | | nixosTests.flannel: port to python, unbreakFlorian Klink2020-04-14
| | * | | | | | | Merge pull request #85162 from Ma27/build-vms-file-locMaximilian Bosch2020-04-15
| | |\ \ \ \ \ \ \
| | | * | | | | | | nixos/build-vms: propagate file locationMaximilian Bosch2020-04-13
| | * | | | | | | | Merge pull request #78129 from flyfloh/airsonic-vhostMichele Guerini Rocco2020-04-15
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | airsonic: enable nginx.recommendedProxySettings with virtualHostFlorian2020-02-28
| | * | | | | | | | Merge pull request #83362 from bachp/boincMatthew Bauer2020-04-14
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | nixos/boinc: create boinc groupPascal Bach2020-03-25
| | | * | | | | | | nixos/boinc: log to journal instead of log filePascal Bach2020-03-25
| | * | | | | | | | Merge pull request #85165 from mayflower/alertmanager-clusteringMaximilian Bosch2020-04-14
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | alertmanager: implement HA clustering supportRobin Gloster2020-04-13
| | * | | | | | | | | Merge pull request #85222 from mayflower/libinput-manual-refworldofpeace2020-04-14
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | nixos/libinput: refer to libinput manualLinus Heckemann2020-04-14
| | * | | | | | | | | | Merge pull request #84255 from prikhi/lightdm-mini-greeter-040worldofpeace2020-04-14
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | lightdm-mini-greeter: 0.3.4 -> 0.4.0Pavan Rikhi2020-04-04
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | * | | | | | | | | | nixos/dysnomia: fix documentRoot propertySander van der Burg2020-04-14
| | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | * | | | | | | | | Merge pull request #85170 from flokli/networking-virtualMichele Guerini Rocco2020-04-14
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | nixosTests.networking: test setting MTU and MAC AddressFlorian Klink2020-04-13
| | | * | | | | | | | | nixosTests.networking.virtual: fix with networkdFlorian Klink2020-04-13
| | | * | | | | | | | | nixosTests.networking: make routing table comparison more reliableFlorian Klink2020-04-13
| | | * | | | | | | | | nixos/networking: move network-link-${i.name} to scripted networkingFlorian Klink2020-04-13