Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #67507 from misuzu/package-3proxy | Michael Raskin | 2019-12-19 |
|\ | |||
| * | nixos/3proxy: note about htpasswd | misuzu | 2019-11-27 |
| * | nixos/3proxy: init | misuzu | 2019-11-11 |
* | | Merge master into staging-next | Frederik Rietdijk | 2019-12-19 |
|\ \ | |||
| * \ | Merge pull request #75787 from chkno/see-also-man-configuration-dot-nix | Maximilian Bosch | 2019-12-19 |
| |\ \ | |||
| | * | | nixos/nixos-option: "See also configuration.nix manpage" in nixos-option manpage | Chuck | 2019-12-18 |
| * | | | Merge pull request #53843 from hedning/session-default | Jan Tojnar | 2019-12-18 |
| |\ \ \ | |||
| | * | | | nixos/displayManager: deprecate separate options for default wm/dm | Jan Tojnar | 2019-12-15 |
| | * | | | nixos/lightdm: enable wayland sessions | Tor Hedin Brønner | 2019-12-15 |
| | * | | | nixos/displayManager: introduce defaultSession | Tor Hedin Brønner | 2019-12-15 |
| | * | | | nixos/displayManager: check for provided sessions in mkDesktops | Tor Hedin Brønner | 2019-12-15 |
| | * | | | nixos/sessionPackages: provide session names in passthru | Tor Hedin Brønner | 2019-12-15 |
| | * | | | nixos/display-manager: extraSessionFilePackages -> sessionPackages | Tor Hedin Brønner | 2019-12-15 |
| * | | | | Merge pull request #75701 from kampka/port-tests-2 | Dmitry Kalinkin | 2019-12-17 |
| |\ \ \ \ | |||
| | * | | | | nixosTests.paperless: Port tests to python | Christian Kampka | 2019-12-15 |
| | * | | | | nixosTests.pdns-recursor: Port tests not python | Christian Kampka | 2019-12-15 |
| | * | | | | nixosTests.peerflix: Port tests to python | Christian Kampka | 2019-12-15 |
| | * | | | | nixosTests.pgmanage: Port tests to python | Christian Kampka | 2019-12-15 |
| | * | | | | nixosTests.php-pcre: Port tests to python | Christian Kampka | 2019-12-15 |
| | * | | | | nixosTests.postgis: Port tests to python | Christian Kampka | 2019-12-15 |
| | * | | | | nixosTests.quagga: Port tests to python | Christian Kampka | 2019-12-15 |
| | * | | | | nixosTests.sonarr: Port tests to python | Christian Kampka | 2019-12-15 |
| | * | | | | nixosTests.switch-test: Port tests to python | Christian Kampka | 2019-12-15 |
| | * | | | | nixosTests.systemd-timesyncd: Port tests to python | Christian Kampka | 2019-12-15 |
| * | | | | | Merge pull request #75695 from kampka/port-tests | Dmitry Kalinkin | 2019-12-17 |
| |\ \ \ \ \ | |||
| | * | | | | | nixosTests.initrd-network: Port tests to python | Christian Kampka | 2019-12-16 |
| | * | | | | | nixosTests.haproxy: Port tests to python | Christian Kampka | 2019-12-16 |
| | * | | | | | nixosTests.leaps: Port tests to python | Christian Kampka | 2019-12-16 |
| | * | | | | | nixosTests.lidarr: Port tests to python | Christian Kampka | 2019-12-16 |
| | * | | | | | nixosTests.mailcatcher: Port tests to python | Christian Kampka | 2019-12-16 |
| | * | | | | | nixosTests.wireguard.namespaces: Port test to python | Christian Kampka | 2019-12-16 |
| * | | | | | | Merge pull request #75795 from kampka/port-tests-4 | Niklas Hambüchen | 2019-12-18 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | nixosTests.hitch: Port tests to python | Christian Kampka | 2019-12-17 |
| | * | | | | | | nixosTests.hadoop.yarn: Port tests to python | Christian Kampka | 2019-12-17 |
| | * | | | | | | nixosTests.hadoop.hdfs: Port tests to python | Christian Kampka | 2019-12-17 |
| | | |_|_|/ / | | |/| | | | | |||
* | | | | | | | Merge master into staging-next | Frederik Rietdijk | 2019-12-17 |
|\| | | | | | | |||
| * | | | | | | Merge pull request #75578 from WilliButz/oxidized-pidfile | Linus Heckemann | 2019-12-17 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | nixos/oxidized: specify PID file in service | WilliButz | 2019-12-12 |
| * | | | | | | | Merge pull request #74722 from gnidorah/mame | Lassulus | 2019-12-17 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||
| | * | | | | | | nixos/mame: init | gnidorah | 2019-12-10 |
* | | | | | | | | Merge master into staging-next | Frederik Rietdijk | 2019-12-16 |
|\| | | | | | | | |||
| * | | | | | | | lorri: add git to daemon path | Leonhard Markert | 2019-12-16 |
| | |_|/ / / / | |/| | | | | | |||
| * | | | | | | Merge pull request #75193 from Ma27/optional-networkd-gateway | Franz Pletz | 2019-12-15 |
| |\ \ \ \ \ \ | |||
| | * | | | | | | nixos/networkd: only set gateway if it's explicitly specified in the module s... | Maximilian Bosch | 2019-12-08 |
| * | | | | | | | Merge pull request #75692 from kampka/postgresql-backup-default | Danylo Hlynskyi | 2019-12-15 |
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||
| | * | | | | | | postgresql-backup: Use saner defaults for pg_dump | Christian Kampka | 2019-12-15 |
* | | | | | | | | Merge staging into staging-next | Frederik Rietdijk | 2019-12-15 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||
| * | | | | | | | Merge staging-next into staging | Frederik Rietdijk | 2019-12-15 |
| |\ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ | Merge branch 'staging-next' into staging | Jan Tojnar | 2019-12-14 |
| |\ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | nfs: set up request-key for id mapping | Kai Wohlfahrt | 2019-12-12 |