summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge master into staging-nextFrederik Rietdijk2019-12-19
|\
| * Merge pull request #75787 from chkno/see-also-man-configuration-dot-nixMaximilian Bosch2019-12-19
| |\ | | | | | | nixos/nixos-option: "See also configuration.nix manpage" in nixos-option manpage
| | * nixos/nixos-option: "See also configuration.nix manpage" in nixos-option manpageChuck2019-12-18
| | |
| * | Merge pull request #53843 from hedning/session-defaultJan Tojnar2019-12-18
| |\ \ | | | | | | | | nixos/displayManager: introduce defaultSession
| | * | nixos/displayManager: deprecate separate options for default wm/dmJan Tojnar2019-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The upstream session files display managers use have no concept of sessions being composed from desktop manager and window manager. To be able to set upstream session files as default session, we need a single option. Having two different ways to set default session would be confusing, though, so we decided to deprecate the old method. We also created separate script for each session, just like we already had a separate desktop file for each one, and started using displayManager.sessionPackages mechanism to make the session handling more uniform.
| | * | nixos/lightdm: enable wayland sessionsTor Hedin Brønner2019-12-15
| | | | | | | | | | | | | | | | | | | | Note: can't launch gnome on wayland due to duplicate entry names: https://github.com/CanonicalLtd/lightdm/issues/16
| | * | nixos/displayManager: introduce defaultSessionTor Hedin Brønner2019-12-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's two ways of providing graphical sessions now: - `displayManager.session` via. `desktopManager.session` and `windowManager.session` - `displayManager.sessionPackages` `sessionPackages` doesn't make a distinction between desktop and window managers. This makes selecting a session provided by a package using `desktopManager.default` nonsensical. We therefor introduce `displayManager.defaultSession` which can select a session from either `displayManager.session` or `displayManager.sessionPackages`. It will default to `desktopManager.default + windowManager.default` as before. If the dm default is "none" it will select the first provided session from `sessionPackages`.
| | * | nixos/displayManager: check for provided sessions in mkDesktopsTor Hedin Brønner2019-12-15
| | | |
| | * | nixos/sessionPackages: provide session names in passthruTor Hedin Brønner2019-12-15
| | | | | | | | | | | | | | | | We want access to the valid session names at evaluation time.
| | * | nixos/display-manager: extraSessionFilePackages -> sessionPackagesTor Hedin Brønner2019-12-15
| | | |
| * | | Merge pull request #75701 from kampka/port-tests-2Dmitry Kalinkin2019-12-17
| |\ \ \ | | | | | | | | | | Port NixOS tests to python
| | * | | nixosTests.paperless: Port tests to pythonChristian Kampka2019-12-15
| | | | |
| | * | | nixosTests.pdns-recursor: Port tests not pythonChristian Kampka2019-12-15
| | | | |
| | * | | nixosTests.peerflix: Port tests to pythonChristian Kampka2019-12-15
| | | | |
| | * | | nixosTests.pgmanage: Port tests to pythonChristian Kampka2019-12-15
| | | | |
| | * | | nixosTests.php-pcre: Port tests to pythonChristian Kampka2019-12-15
| | | | |
| | * | | nixosTests.postgis: Port tests to pythonChristian Kampka2019-12-15
| | | | |
| | * | | nixosTests.quagga: Port tests to pythonChristian Kampka2019-12-15
| | | | |
| | * | | nixosTests.sonarr: Port tests to pythonChristian Kampka2019-12-15
| | | | |
| | * | | nixosTests.switch-test: Port tests to pythonChristian Kampka2019-12-15
| | | | |
| | * | | nixosTests.systemd-timesyncd: Port tests to pythonChristian Kampka2019-12-15
| | | | |
| * | | | Merge pull request #75695 from kampka/port-testsDmitry Kalinkin2019-12-17
| |\ \ \ \ | | | | | | | | | | | | Port NixOS tests to python
| | * | | | nixosTests.initrd-network: Port tests to pythonChristian Kampka2019-12-16
| | | | | |
| | * | | | nixosTests.haproxy: Port tests to pythonChristian Kampka2019-12-16
| | | | | |
| | * | | | nixosTests.leaps: Port tests to pythonChristian Kampka2019-12-16
| | | | | |
| | * | | | nixosTests.lidarr: Port tests to pythonChristian Kampka2019-12-16
| | | | | |
| | * | | | nixosTests.mailcatcher: Port tests to pythonChristian Kampka2019-12-16
| | | | | |
| | * | | | nixosTests.wireguard.namespaces: Port test to pythonChristian Kampka2019-12-16
| | | | | |
| * | | | | Merge pull request #75795 from kampka/port-tests-4Niklas Hambüchen2019-12-18
| |\ \ \ \ \ | | | | | | | | | | | | | | Port NixOS tests to python
| | * | | | | nixosTests.hitch: Port tests to pythonChristian Kampka2019-12-17
| | | | | | |
| | * | | | | nixosTests.hadoop.yarn: Port tests to pythonChristian Kampka2019-12-17
| | | | | | |
| | * | | | | nixosTests.hadoop.hdfs: Port tests to pythonChristian Kampka2019-12-17
| | | |_|_|/ | | |/| | |
* | | | | | Merge master into staging-nextFrederik Rietdijk2019-12-17
|\| | | | |
| * | | | | Merge pull request #75578 from WilliButz/oxidized-pidfileLinus Heckemann2019-12-17
| |\ \ \ \ \ | | | | | | | | | | | | | | nixos/oxidized: specify PID file in service
| | * | | | | nixos/oxidized: specify PID file in serviceWilliButz2019-12-12
| | | | | | |
| * | | | | | Merge pull request #74722 from gnidorah/mameLassulus2019-12-17
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | mame: 0.215 -> 0.216
| | * | | | | nixos/mame: initgnidorah2019-12-10
| | | | | | |
* | | | | | | Merge master into staging-nextFrederik Rietdijk2019-12-16
|\| | | | | |
| * | | | | | lorri: add git to daemon pathLeonhard Markert2019-12-16
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Lorri's daemon invokes Nix which requires Git on its path. https://github.com/target/lorri/issues/255
| * | | | | Merge pull request #75193 from Ma27/optional-networkd-gatewayFranz Pletz2019-12-15
| |\ \ \ \ \ | | | | | | | | | | | | | | nixos/networkd: only set gateway if it's explicitly specified in the module system
| | * | | | | nixos/networkd: only set gateway if it's explicitly specified in the module ↵Maximilian Bosch2019-12-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | system
| * | | | | | Merge pull request #75692 from kampka/postgresql-backup-defaultDanylo Hlynskyi2019-12-15
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | postgresql-backup: Use saner defaults for pg_dump
| | * | | | | postgresql-backup: Use saner defaults for pg_dumpChristian Kampka2019-12-15
| | | | | | |
* | | | | | | Merge staging into staging-nextFrederik Rietdijk2019-12-15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge staging-next into stagingFrederik Rietdijk2019-12-15
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'staging-next' into stagingJan Tojnar2019-12-14
| |\ \ \ \ \ \ \
| * | | | | | | | nfs: set up request-key for id mappingKai Wohlfahrt2019-12-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A patch is necessary upstream to support multiple configs via symlinks in /etc/request-key.d Once that is done, we can add support for CIFS as well
| * | | | | | | | nixos/nfs: test nfs with kerberos authenticationKai Wohlfahrt2019-12-12
| | | | | | | | |
| * | | | | | | | nixos/nfs: convert test to pythonKai Wohlfahrt2019-12-12
| | | | | | | | |
* | | | | | | | | nixos containers: disable NixOS manual in container config. (#75659)Danylo Hlynskyi2019-12-15
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes ~2.5x speed up of an empty container instantiate, hence reduces rebuild time of system with many declarative containers. Note that this doesn't affect production systems much, becaseu those most likely already include `minimal.nix` profile.