about summary refs log tree commit diff
path: root/nixos
Commit message (Collapse)AuthorAge
* Merge branch 'master' into staging-nextVladimír Čunát2020-06-10
|\ | | | | | | In particular, this fixes ISO evaluation.
| * Merge #89903: nixos/make-iso9660: fix zstd inputVladimír Čunát2020-06-10
| |\
| | * nixos/make-iso9660: fix zstd inputFinn Behrens2020-06-09
| | |
| * | Merge pull request #89457 from NixOS/f/pam_orderingPeter Hoeg2020-06-10
| |\ \ | | | | | | | | nixos/pam: mount encrypted home earlier
| | * | nixos/pam: mount encrypted home earlierPeter Hoeg2020-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was done by curro: The generated /etc/pam.d/* service files invoke the pam_systemd.so session module before pam_mount.so, if both are enabled (e.g. via security.pam.services.foo.startSession and security.pam.services.foo.pamMount respectively). This doesn't work in the most common scenario where the user's home directory is stored in a pam-mounted encrypted volume (because systemd will fail to access the user's systemd configuration).
* | | | Merge branch 'master' into staging-nextJan Tojnar2020-06-10
|\| | |
| * | | Merge pull request #70327 from abbradar/synapse-pluginszimbatm2020-06-09
| |\ \ \ | | | | | | | | | | Refactor Synapse plugins, add matrix-synapse-pam
| | * | | matrix-synapse service: add plugins optionNikolay Amiantov2020-06-01
| | | | |
| * | | | Merge pull request #89881 from zowoq/gnome-artworkJan Tojnar2020-06-09
| |\ \ \ \ | | |_|_|/ | |/| | | nixos/gnome3: nixos-artwork -> pkgs.nixos-artwork
| | * | | nixos/gnome3: nixos-artwork -> pkgs.nixos-artworkzowoq2020-06-09
| | | | |
| * | | | Merge pull request #89297 from Ma27/bump-hydraEelco Dolstra2020-06-09
| |\ \ \ \ | | |/ / / | |/| | | hydra-unstable: 2020-04-16 -> 2020-06-01
| | * | | hydra-unstable: 2020-04-16 -> 2020-06-01Maximilian Bosch2020-06-02
| | | | |
| * | | | nixos/ssh: add crypto optionsIzorkin2020-06-08
| | | | |
* | | | | Merge master into staging-nextFrederik Rietdijk2020-06-08
|\| | | |
| * | | | Merge pull request #89762 from nlewo/nextcloud-oc_passFlorian Klink2020-06-08
| |\ \ \ \ | | | | | | | | | | | | nixos/nextcloud: preserve OC_PASS env variable in the occ wrapper
| | * | | | nixos/nextcloud: preserve OC_PASS env variable in the occ wrapperAntoine Eiche2020-06-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OC_PASS environment variable can be used to create a user with `occ user:add --password-from-env`. It is currently not possible to use the `nextcloud-occ` to "non-interactively" create a user since this variable is ignored by sudo.
| * | | | | Merge pull request #88574 from JJJollyjim/qemu-vm-qboot-optFlorian Klink2020-06-08
| |\ \ \ \ \ | | | | | | | | | | | | | | nixos/qemu-vm: add option to use qboot
| | * | | | | nixos/qemu-vm: add option to use a non-standard BIOSJamie McClymont2020-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'd like to change the default on x86 platforms to qboot at some point, since it saves a fair bit of startup time.
| * | | | | | Merge pull request #86163 from worldofpeace/wallpaper-refactorworldofpeace2020-06-07
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Gnome and Pantheon: install nixos wallpapers
| | * | | | | nixos/pantheon: install nixos wallpaperworldofpeace2020-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #86146
| | * | | | | nixos/gnome3: install nixos wallpapersworldofpeace2020-04-29
| | | | | | |
| | * | | | | nixos/lightdm: change background type to pathJan Tojnar2020-04-29
| | | | | | |
| | * | | | | nixos-artwork: add file path attributesworldofpeace2020-04-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes things so much easier, and we install to the path that both gnome-backgrounds and elementary-wallpapers install to.
| * | | | | | Merge pull request #85947 from prusnak/images-zstdMarek Mahut2020-06-07
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Use zstd for ISO and SD images
| | * | | | | | manual/rl-2009.xml: add mention about SD/ISO images compressionPavol Rusnak2020-04-24
| | | | | | | |
| | * | | | | | nixos/system-path: add zstdPavol Rusnak2020-04-24
| | | | | | | |
| | * | | | | | iso-image: use zstd for compressionPavol Rusnak2020-04-24
| | | | | | | |
| | * | | | | | sd-image: use zstd for compressionPavol Rusnak2020-04-24
| | | | | | | |
| * | | | | | | boot: fix order of arguments for `hasPrefix` (#89751)Nadrieril2020-06-07
| | | | | | | |
* | | | | | | | Merge master into staging-nextFrederik Rietdijk2020-06-07
|\| | | | | | |
| * | | | | | | nixos/freeswitch: Unit improvements and add fs_cliJanne Heß2020-06-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This switches the unit to Restart=on-failure and switches the CPU policy to fifo (the daemon tries to do that itself, but is denied permission). Also add the package to $PATH to be able to use fs_cli easily.
* | | | | | | | Merge master into staging-nextFrederik Rietdijk2020-06-05
|\| | | | | | |
| * | | | | | | Merge pull request #85418 from lopsided98/grub-initrd-secretsJörg Thalheim2020-06-05
| |\ \ \ \ \ \ \
| | * | | | | | | nixos/grub: support initrd secretsBen Wolsieffer2020-06-04
| | | | | | | | |
| | * | | | | | | nixos/stage-1: make boot.initrd.secrets appear in the manualBen Wolsieffer2020-06-04
| | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge pull request #87878 from Izorkin/mariadb-updateFlorian Klink2020-06-05
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | mariadb: 10.4.12 -> 10.4.13
| | * | | | | | | nixos/tests/mysql80: add check with unix authIzorkin2020-05-23
| | | | | | | | |
| | * | | | | | | nixos/tests/mysql57: add check with unix authIzorkin2020-05-23
| | | | | | | | |
| * | | | | | | | Merge pull request #89479 from edolstra/nix-2.4-completionEelco Dolstra2020-06-05
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Don't enable nix-bash-completions when using Nix 2.4
| | * | | | | | | | Don't enable nix-bash-completions when using Nix 2.4Eelco Dolstra2020-06-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2.4 has its own completion script which collides with nix-bash-completions.
| * | | | | | | | | Merge pull request #89525 from Mic92/cgmanagerJörg Thalheim2020-06-05
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | cgmanager: removeJörg Thalheim2020-06-05
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #30023
| * | | | | | | | | Merge pull request #89510 from flokli/buildbot-pbPortFlorian Klink2020-06-05
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | nixos/buildbot-master: fix typo in services.buildbot-master.bpPort
| | * | | | | | | | | nixos/buildbot-master: fix typo in services.buildbot-master.bpPortFlorian Klink2020-06-05
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's pbPort, and it's also a connection string, meaning listen-on-localhost is also possible. Provide an alias for the old option name, so old configs still work.
| * / / / / / / / / gitlab: 12.10.8 -> 13.0.3Robin Gloster2020-06-04
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/ https://about.gitlab.com/releases/2020/05/27/security-release-13-0-1-released/ https://about.gitlab.com/releases/2020/05/29/gitlab-13-0-3-released/ The gitaly gitlab-shell config has moved into gitaly.toml. See https://gitlab.com/gitlab-org/gitaly/-/issues/2182 for more info.
* | | | | | | | | Merge master into staging-nextFrederik Rietdijk2020-06-04
|\| | | | | | | |
| * | | | | | | | Merge pull request #89407 from primeos/empty-hostname-fixMichael Weiss2020-06-03
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | nixos: Allow empty hostnames again
| | * | | | | | | | nixos: Allow empty hostnames againMichael Weiss2020-06-03
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression from 993baa587c4 which requires networking.hostName to be a valid DNS label [0]. Unfortunately we missed the fact that the hostnames may also be empty, if the user wants to obtain it from a DHCP server. This is even required by a few modules/images (e.g. Amazon EC2, Azure, and Google Compute). [0]: https://github.com/NixOS/nixpkgs/pull/76542#issuecomment-638138666
| * | | | | | | | | nix: 2.3.6 -> 2.3.6Eelco Dolstra2020-06-03
| |/ / / / / / / /
| * | | | | | | | Merge pull request #89337 from mweinelt/hass-yaml-funJörg Thalheim2020-06-03
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |