1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-12 07:34:36 +00:00
Commit graph

18751 commits

Author SHA1 Message Date
ajs124 7ce8117238
Merge pull request #100604 from helsinki-systems/fix/icingaweb2
nixos/icingaweb2: Fix php packages
2020-10-15 19:18:53 +02:00
Janne Heß e2da1219d4
nixos/icingaweb2: Fix php packages 2020-10-15 16:16:33 +02:00
Alvar 17bcc043f0
nixos/vim: configurable vim package (#100132) 2020-10-15 10:55:16 +02:00
Jan Tojnar 2a4607f442
Revert "nixos/display-managers: install sessionData.desktops"
This reverts commit 3cd2b59b8c.

It created infinite recursion when using LXQt, since lxqt module
uses `config.system.path` in `services.xserver.desktopManager.session`.
`config.system.path` is a `buildEnv` that depends on `environment.systemPackages`.
2020-10-15 07:32:08 +02:00
Frederik Rietdijk b3aed163d5
Merge pull request #99709 from NixOS/staging-next
Staging next
2020-10-14 21:10:31 +02:00
Michael Weiss 03ce325365
nixos/doc: Fix one command to build the NixOS manual
This one occurrence wasn't updated:
$ git grep "nix-build nixos/release.nix -A manual"
nixos/doc/manual/README:    nix-build nixos/release.nix -A manual.x86_64-linux
nixos/doc/manual/development/meta-attributes.xml:<screen><prompt>$ </prompt>nix-build nixos/release.nix -A manual</screen>
nixos/doc/manual/development/writing-documentation.xml:<screen>nix-build nixos/release.nix -A manual.x86_64-linux</screen>
2020-10-14 18:10:53 +02:00
Dominique Martinet f8d78b9f67
confinement: fix assert for serviceConfig.ProtectSystem
serviceConfig.ProtectSystem is usually a string so if set, the assert
itself would error out leaving no useable trace:

  # nixos-rebuild switch --show-trace
  building Nix...
  building the system configuration...
  error: while evaluating the attribute 'config.system.build.toplevel' at /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/system/activation/top-level.nix:293:5:
  while evaluating 'foldr' at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/lists.nix:52:20, called from /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/system/activation/top-level.nix:128:12:
  while evaluating 'fold'' at /nix/var/nix/profiles/per-user/root/channels/nixos/lib/lists.nix:55:15, called from /nix/var/nix/profiles/per-user/root/channels/nixos/lib/lists.nix:59:8:
  while evaluating anonymous function at /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/system/activation/top-level.nix:121:50, called from undefined position:
  while evaluating the attribute 'assertion' at /nix/var/nix/profiles/per-user/root/channels/nixos/nixos/modules/security/systemd-confinement.nix:163:7:
  value is a string while a Boolean was expected

Fix the check to give a sensible assert message instead; the attribute
should either be not set or false bool to pass.

Closes: #99000
2020-10-14 11:56:18 +02:00
Frederik Rietdijk b981eca057 Merge master into staging-next 2020-10-14 11:32:49 +02:00
Maximilian Bosch b199005979
nixos/tests/systemd-networkd-vrf: fix eval
The `Metric`-values of routes defined via `networkd` must be integers.
2020-10-13 22:39:02 +02:00
Frederik Rietdijk 9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
Lassulus 53f810cb4b
Merge pull request #100141 from xaverdh/xmonad-correct-path
xmonad: put the correct xmonad binary in PATH
2020-10-13 19:01:56 +02:00
Doron Behar a17c7a9973
Merge pull request #100271 from berbiche/cagebreak-1.4.3 2020-10-13 19:07:18 +03:00
Jonathan Ringer 82e2fdea1e nixos/doc: add nvidia prime changes 2020-10-12 22:59:54 -07:00
Nicolas Berbiche f103463d68
cagebreak: use wayinfo for Wayland test 2020-10-12 20:31:53 -04:00
Florian Klink 399a2ab954
Merge pull request #98917 from lovesegfault/klipper-init
klipper: init at 0.8.0
2020-10-13 00:20:24 +02:00
Doron Behar 58b8ae4127
Merge pull request #100066 from matthuszagh/kicad-srcs 2020-10-12 22:55:16 +03:00
Michele Guerini Rocco 9b6fc07d15
Merge pull request #100060 from aanderse/dnsdist
nixos/dnsdist: use upstream systemd unit
2020-10-12 21:20:33 +02:00
Dominik Xaver Hörl 7389407490 nixos/xmonad: add lassulus and xaverdh as maintainers 2020-10-12 21:00:43 +02:00
Matt Huszagh b90776cbbf add 21.03 release notes for renamed kicad options 2020-10-12 11:32:44 -07:00
Aaron Andersen f4ff303c3b nixos/dnsdist: use upstream systemd unit 2020-10-12 12:17:11 -04:00
Dominik Xaver Hörl 206c668d7f nixos/xmonad: improve module docs 2020-10-12 14:48:07 +02:00
Dominik Xaver Hörl 0a42b8cac6 nixosTests.xmonad: don't rely on xmonad being "vanilla" after restart
The old (slightly broken) behavior of the xmonad module was to put the vanilla xmonad binary into PATH. This was changed to put the users xmonad into PATH instead.

But since the config for the xmonad test uses `launch` (to avoid xmonads self-recompilation logic), it now can't handle the `--restart` flag anymore. So instead use a key binding for restarting, and let xmonad spawn a new xterm on restart.

The key binding has to be explicitly added because the default binding
will shell out to `xmonad --restart` and therefore not work with the `launch` entrypoint.
2020-10-12 14:48:07 +02:00
Timo Kaufmann 787ec15440
Merge pull request #94187 from fgaz/ft2-clone/1.27
ft2-clone: add a test
2020-10-12 11:06:04 +02:00
Bernardo Meurer 97eadef0c3
nixos/klipper: init 2020-10-11 15:55:50 -07:00
Florian Klink a6fec75d04
Merge pull request #93426 from helsinki-systems/feat/gitlab-pages
nixos/gitlab: Support pages
2020-10-11 23:50:19 +02:00
Florian Klink a1cb02148b
Merge pull request #99912 from m1cr0man/ocspfix
nixos/acme: Fix ocspMustStaple option and add test
2020-10-11 23:44:33 +02:00
Florian Klink a61ca0373b nixosTests.avahi: add avahi-with-resolved
This allows testing avahi works with resolved being enabled, as a
regression test for https://github.com/NixOS/nixpkgs/pull/99530.
2020-10-11 20:46:21 +02:00
Ben Wolsieffer 8294af0284 nixos/avahi: fix nss module
mdns_minimal must be placed before resolve in nsswitch.conf
2020-10-11 20:15:13 +02:00
Simon Pettersson b2efedd5e5 nixos/xserver: fix xkbvalidate for cross compiling.
xserver uses the wrong version of xkbvalidate, the one from
buildPackages should be used or else the resulting xkbvalidate binary is
compiled for the target architecture.
2020-10-11 20:08:57 +02:00
Ryan Mulligan 8ebf265923
Merge pull request #86404 from nuxeh/nuxeh/domoticz-init-2020.2
domoticz: init at 2020.2
2020-10-11 05:59:28 -07:00
Kevin Cox 8b33d575e4
Merge pull request #98084 from turion/patch-5
agda.section.md: Fix header and enumeration
2020-10-11 07:29:58 -04:00
Ryan Mulligan 4a3fe8d306 nixos/domoticz: use DynamicUser and StateDirectory 2020-10-11 11:15:56 +01:00
WORLDofPEACE 8cae8e54a1 Revert "mediatomb/gerbera: Add release note information for 20.09"
This was added to a release note when it's a feature not landing in that release.

This reverts commit a007e07abb.
2020-10-10 23:26:42 -04:00
WORLDofPEACE 13b192749c nixos/gnome3: don't install epiphany default
See https://github.com/NixOS/nixpkgs/issues/98819
2020-10-10 22:12:59 -04:00
Jan Tojnar aabcf2d8f5
Merge branch 'master' into staging-next 2020-10-11 00:27:21 +02:00
WORLDofPEACE 38237e95e6
Merge pull request #100103 from jtojnar/fontconfig-rn
nixos/doc: Mention fontconfig changes in 20.09 RN
2020-10-10 16:47:39 -04:00
WORLDofPEACE 2e087fe0d9
Merge pull request #100097 from Jiehong/doc/release_note_python
doc: add the removal of Python 3.5 to the 20.09 release notes (#95765)
2020-10-10 16:44:25 -04:00
Michael Weiss 4a600af1b1 doc: Document a workaround for using an FQDN as hostname
Since #76542 this workaround is required to use a FQDN as hostname. See
#94011 and #94022 for the related discussion. Due to some
potential/unresolved issues (legacy software, backward compatibility,
etc.) we're documenting this workaround [0].

[0]: https://github.com/NixOS/nixpkgs/issues/94011#issuecomment-705952300
2020-10-10 10:48:54 -07:00
Michael Weiss 826ed96c10
nixos/networking: Switch to home.arpa as an example for the domain
The special-use domain "home.arpa." is designated for non-unique use in
residential home networks [0] and registered as such [1]. Therefore it
is more appropriate than "home." which could cause conflicts or result
in queries that leak out and reach the root name servers.

[0]: https://tools.ietf.org/html/rfc8375
[1]: https://www.iana.org/assignments/special-use-domain-names/special-use-domain-names.xhtml
2020-10-10 17:41:42 +02:00
Dominik Xaver Hörl 67eb45ddce xmonad: put the correct xmonad binary in PATH 2020-10-10 13:20:04 +02:00
Vladimír Čunát 338b25697c
Merge branch 'master' into staging-next
Quite many rebuilds from master:
> Estimating rebuild amount by counting changed Hydra jobs.
>    3926 x86_64-darwin
>    4645 x86_64-linux
2020-10-10 11:32:10 +02:00
WORLDofPEACE 7a2eccfab0
Merge pull request #100112 from worldofpeace/fix-gnome-logout-multisession
nixos/display-managers: install sessionData.desktops
2020-10-09 19:31:05 -04:00
WORLDofPEACE 3cd2b59b8c nixos/display-managers: install sessionData.desktops
Fixes https://github.com/NixOS/nixpkgs/issues/100108
2020-10-09 18:38:16 -04:00
Jan Tojnar be2f1cb15c
nixos/doc: Mention fontconfig changes in 20.09 RN
This is a major change but it should not cause any issues.
2020-10-09 22:09:37 +02:00
Jiehong Ma 63c7735733 doc: add the removal of Python 3.5 to the 20.09 release notes (#95765) 2020-10-09 20:03:15 +02:00
Jiehong Ma c3e4594eaf doc: add AMD rocm and vulkan to 20.09 release notes (#95765) 2020-10-09 18:24:27 +02:00
zowoq f9bb39e294 nixos/pam: remove trailing whitespace 2020-10-09 18:31:20 +10:00
Frederik Rietdijk ec28e32c9e Merge master into staging-next 2020-10-08 21:47:26 +02:00
Miles Breslin 8e628f8eea
nixos/pam: Add option to set pam-u2f appid (#73591) 2020-10-08 14:37:40 -04:00
Timo Kaufmann a4cde0f969 nixos/mediatomb: fix doc errors
Follow-up to #93450 to fix the manual build.
2020-10-08 16:04:11 +02:00