Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge branch 'staging-next' into staging | Dmitry Kalinkin | 2021-04-08 |
|\ | | | | | | | | | | | | | Conflicts: pkgs/development/python-modules/panel/default.nix pkgs/os-specific/linux/kernel/generic.nix pkgs/servers/home-assistant/default.nix | ||
| * | Merge master into staging-next | github-actions[bot] | 2021-04-09 |
| |\ | |||
| | * | nixos/libvirtd: add package option | Luke Granger-Brown | 2021-04-09 |
| | | | | | | | | | | | | | | | | | | | | | At the moment, it's not possible to override the libvirtd package used without supplying a nixpkgs overlay. Adding a package option makes libvirtd more consistent and allows enabling e.g. ceph and iSCSI support more easily. | ||
| | * | Merge pull request #91318 from stephank/pkg-doh-proxy-rust | Sandro | 2021-04-08 |
| | |\ | |||
| | | * | doh-proxy-rust: init at 0.3.8 | Stéphan Kochen | 2021-04-07 |
| | | | | |||
| | * | | Merge pull request #118409 from cpcloud/fix-nvidia-podman | Bernardo Meurer | 2021-04-08 |
| | |\ \ | | | | | | | | | | | virtualisation/containers: move to settings model for containersConf | ||
| | | * | | nixos/containers: move extraConfig to settings model | Phillip Cloud | 2021-04-07 |
| | | | | | |||
| * | | | | Merge master into staging-next | github-actions[bot] | 2021-04-08 |
| |\| | | | |||
| | * | | | Merge pull request #118719 from dotlambda/home-assistant-tests | Robert Schütz | 2021-04-08 |
| | |\ \ \ | | | | | | | | | | | | | nixos/home-assistant: use override before overridePythonAttrs | ||
| | | * | | | nixos/home-assistant: use override before overridePythonAttrs | Robert Schütz | 2021-04-08 |
| | | | | | | |||
| | * | | | | kernel: Add test for RC kernels | Tim Steinbach | 2021-04-08 |
| | | | | | | |||
| | * | | | | kernel: Add test for 4.4 | Tim Steinbach | 2021-04-08 |
| | | | | | | |||
| | * | | | | kernel: Add test for 4.9 | Tim Steinbach | 2021-04-08 |
| | | | | | | |||
| | * | | | | kernel: Add test for 4.14 | Tim Steinbach | 2021-04-08 |
| | | | | | | |||
| | * | | | | kernel: Add test for 4.19 | Tim Steinbach | 2021-04-08 |
| | | | | | | |||
| | * | | | | kernel: Add test for 5.4 | Tim Steinbach | 2021-04-08 |
| | | | | | | |||
| | * | | | | kernel: Add test for 5.10 | Tim Steinbach | 2021-04-08 |
| | | | | | | |||
| | * | | | | kernel: Remove old kernel tests | Tim Steinbach | 2021-04-08 |
| | | | | | | |||
| | * | | | | kernel: Add tests to passthru.tests | Tim Steinbach | 2021-04-08 |
| | | | | | | |||
| | * | | | | Merge pull request #118805 from helsinki-systems/fix/eval/no-aliases-iproute2 | Sandro | 2021-04-08 |
| | |\ \ \ \ | | | | | | | | | | | | | | | treewide: fix eval without aliases after 9378fdf87e0626e8c63a90a378c3… | ||
| | | * | | | | treewide: fix eval without aliases after ↵ | ajs124 | 2021-04-08 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9378fdf87e0626e8c63a90a378c38444ff54808b | ||
| | * | | | | | Merge pull request #116074 from talyz/discourse | Kim Lindberger | 2021-04-08 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | discourse: Add package and NixOS module | ||
| | | * | | | | rl-2105: Add Discourse module note | talyz | 2021-04-05 |
| | | | | | | | |||
| | | * | | | | nixos/discourse: Add NixOS manual entry | talyz | 2021-04-05 |
| | | | | | | | |||
| | | * | | | | nixos/discourse: Add test | talyz | 2021-04-05 |
| | | | | | | | |||
| | | * | | | | nixos/discourse: Init | talyz | 2021-04-05 |
| | | | | | | | |||
| | | * | | | | nixos/nginx: Add an option to specify additional third-party modules | talyz | 2021-04-04 |
| | | | | | | | |||
* | | | | | | | Merge branch 'staging-next' into staging | Jan Tojnar | 2021-04-08 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | In python-packages.nix, resolve conflict between 50d604314e736d24dc7aa6749b5482c859147b17 and 187d0371ab3220ee40da1f616e4c48d85ac28986. | ||
| * | | | | | | Merge master into staging-next | github-actions[bot] | 2021-04-08 |
| |\| | | | | | |||
| | * | | | | | Merge pull request #118633 from mweinelt/home-assistant-team | Martin Weinelt | 2021-04-08 |
| | |\ \ \ \ \ | |||
| | | * | | | | | home-assistant: Move maintainership to home-assistant team | Martin Weinelt | 2021-04-07 |
| | | | |/ / / | | | |/| | | | |||
| | * | | | | | Merge pull request #118701 from jansol/pipewire | Bernardo Meurer | 2021-04-07 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | pipewire: 0.3.24 -> 0.3.25 | ||
| | | * | | | | | pipewire: 0.3.24 -> 0.3.25 | Jan Solanti | 2021-04-07 |
| | | | | | | | | |||
| | * | | | | | | Merge pull request #118742 from FRidh/tailscale | Sandro | 2021-04-07 |
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | services.tailscale: add openresolv to path | ||
| | | * | | | | | services.tailscale: add openresolv to path | Frederik Rietdijk | 2021-04-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without openresolv, magic dns is not very usable. | ||
| | * | | | | | | Merge #117519: nixos/amdgpu: remove | Vladimír Čunát | 2021-04-07 |
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | |||
| | | * | | | | | nixos/amdgpu: remove | TredwellGit | 2021-03-24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/NixOS/nixpkgs/pull/111551#issuecomment-802082766 | ||
* | | | | | | | | Merge staging-next into staging | github-actions[bot] | 2021-04-07 |
|\| | | | | | | | |||
| * | | | | | | | Merge master into staging-next | github-actions[bot] | 2021-04-07 |
| |\| | | | | | | |||
| | * | | | | | | Merge pull request #116749 from vroad/docker-layered-image-fakeroot | Robert Hensing | 2021-04-07 |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | dockerTools.streamLayeredImage: add fakeRootCommands option | ||
| | | * | | | | | dockerTools.streamLayeredImage: Add test for fakeRootCommands | vroad | 2021-04-07 |
| | | | | | | | | |||
| | * | | | | | | nixos/samba: remove bad example for "securityType" option | Emery Hemingway | 2021-04-07 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Setting "security = share" causes silent failures. | ||
* | | | | | | | | Merge staging-next into staging | github-actions[bot] | 2021-04-07 |
|\| | | | | | | | |||
| * | | | | | | | Merge master into staging-next | github-actions[bot] | 2021-04-07 |
| |\| | | | | | | |||
| | * | | | | | | Merge pull request #117554 from Zopieux/snapcast-meta | Sandro | 2021-04-07 |
| | |\ \ \ \ \ \ | |||
| | | * | | | | | | nixos/snapserver: add support for meta stream type introduced in 0.23.0 | Alexandre Macabies | 2021-03-25 |
| | | | | | | | | | |||
| | * | | | | | | | Merge pull request #118706 from lukegb/pomerium | Sandro | 2021-04-07 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | nixos/pomerium: fix useACMEHost | ||
| | | * | | | | | | | nixos/pomerium: fix useACMEHost | Luke Granger-Brown | 2021-04-07 |
| | | | |_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | useACMEHost doesn't work properly, because I forgot to actually define the variable that is being relied upon here. Oops. | ||
| | * | | | | | | | nixos/gitlab: do not set backup.upload by default | Milan Pässler | 2021-04-07 |
| | | |_|_|_|/ / | | |/| | | | | | |||
* | | | | | | | | Merge branch 'staging-next' into staging | Jan Tojnar | 2021-04-07 |
|\| | | | | | | |