3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

25037 commits

Author SHA1 Message Date
github-actions[bot] b40a01817b
Merge master into staging-next 2022-01-08 18:01:00 +00:00
Jacek Galowicz 048fd95f10
Merge pull request #146905 from Synthetica9/failure_mode
nixos/test-driver: add polling_condition
2022-01-08 18:28:25 +01:00
Dmitry Kalinkin 477540469e
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/gradient-utils/default.nix
	pkgs/development/python-modules/gradient/default.nix
2022-01-08 02:39:35 -05:00
Thomas Dy 97864e984d nixos/kubernetes: actually set containerd to use systemd cgroups
The correct configuration is listed in the kubernetes documentation
https://kubernetes.io/docs/setup/production-environment/container-runtimes/#containerd-systemd

The correct option can also be seen in `containerd config default`
2022-01-08 17:29:32 +10:00
pennae 2d356a1969 nixos/kubernetes: move all k8s docs out of the sandbox
otherwise the manual won't build.

ideally they'll move back into the sandbox at some point, but we're
obviously not qualified to put them there.
2022-01-08 17:13:27 +10:00
pennae 635376d3af Revert "nixos/kubernetes: make lib option internal and readonly"
This reverts commit 7e28421e17.
2022-01-08 17:13:27 +10:00
Jan Tojnar 283c47bc45
Merge pull request #150548 from K900/wireplumber
wireplumber: init, add NixOS module
2022-01-08 06:11:59 +01:00
Jan Tojnar 0c4ccc29ce
Merge pull request #153840 from bobby285271/gsd
nixos/gnome-settings-daemon: pick up correct .wants directories
2022-01-08 06:07:14 +01:00
Bobby Rong 84ad67f7c6
nixos/gnome-settings-daemon: pick up correct .wants directories
In https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/153
the user target names for GSD components has been renamed for example
from `gsd-a11y-settings.target` to `org.gnome.SettingsDaemon.A11ySettings.target`,
and nowadays `gsd-*.target` are just symbolic links of `/dev/null` and will be
removed in the future.

At the same time, as mentioned in d27212d466,
we are adding `systemd.user.targets.<name>.wants` stuff here only because
systemd.packages doesn't pick the .wants directories. Nowadays those GSD components
are managed in `/etc/systemd/user/gnome-session@gnome.target.d/gnome.session.conf`
so it should be safe to remove them.

In this commit we also try to pick up those new .wants directories, see also
https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/blob/41.0/plugins/meson.build#L57

Result of `cd /nix/store/iqzy2a6wn9bq9hqx7pqx0a153s5xlnwp-gnome-settings-daemon-41.0; find | grep wants`:

```
./share/systemd/user/gnome-session-x11-services-ready.target.wants
./share/systemd/user/gnome-session-x11-services-ready.target.wants/org.gnome.SettingsDaemon.XSettings.service
./share/systemd/user/gnome-session-x11-services.target.wants
./share/systemd/user/gnome-session-x11-services.target.wants/org.gnome.SettingsDaemon.XSettings.service
```

Result of `cd /nix/store/armzljlnsvc1gn0nq0bncb9lf8fy32zy-gnome-settings-daemon-3.34.0; find | grep wants`:

```
./lib/systemd/user/gnome-session-initialized.target.wants
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-a11y-settings.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-color.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-datetime.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-power.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-housekeeping.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-keyboard.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-media-keys.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-screensaver-proxy.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-sharing.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-sound.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-smartcard.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-wacom.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-print-notifications.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-rfkill.target
./lib/systemd/user/gnome-session-initialized.target.wants/gsd-wwan.target
./lib/systemd/user/gnome-session-x11-services.target.wants
./lib/systemd/user/gnome-session-x11-services.target.wants/gsd-xsettings.target
```
2022-01-08 10:19:02 +08:00
Maciej Krüger 801d832872
Merge pull request #125451 from zhaofengli/qemu-riscv64-sd-image 2022-01-07 22:14:05 +01:00
Jonathan Ringer 86f9a32c4c
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/hydra/default.nix
2022-01-07 10:31:29 -08:00
Patrick Hilhorst 0c3f1cf420
Merge pull request #153273 from Synthetica9/passthru-driverInteractive 2022-01-07 16:04:43 +01:00
K900 4909a15582 nixos/wireplumber: init
This is extremely basic for now, but we can add more stuff later
2022-01-07 17:34:28 +03:00
Aaron Andersen 2e95239bd1
Merge pull request #153729 from aanderse/nixos/caddy
nixos/caddy: add globalConfig option
2022-01-07 08:35:07 -05:00
Zhaofeng Li 048cb042d6 nixos/tests/boot: Add ubootExtlinux test 2022-01-06 17:44:17 -08:00
Zhaofeng Li 2cb7743e9c sd-image-x86_64: init 2022-01-06 17:31:17 -08:00
Zhaofeng Li b70c23ea61 sd-image: Propagate imageName to derivation 2022-01-06 17:31:17 -08:00
Zhaofeng Li 823acb25dd sd-image-riscv64-qemu: init 2022-01-06 17:23:10 -08:00
Zhaofeng Li 16a907b00b generic-extlinux-compatible: Allow disabling generation of device tree directives 2022-01-06 17:23:10 -08:00
Zhaofeng Li d7cdd09ad2 all-hardware: Add virtio_mmio module 2022-01-06 17:23:10 -08:00
Zhaofeng Li 41cad5ea68 all-hardware: Disable VMWare and Hyper-V modules on non-X86 platforms 2022-01-06 17:23:10 -08:00
github-actions[bot] 4da57fcb62
Merge master into staging-next 2022-01-07 00:01:42 +00:00
Renaud 952aa6f820
Merge pull request #148606 from McSinyx/fetch-srht-recurse
fetchFromSourcehut: allow recursive fetching
2022-01-06 22:55:23 +01:00
Aaron Andersen 5dc2454267
Merge pull request #153706 from ymarkus/bookstack-module
nixos/bookstack: fix setup service
2022-01-06 15:09:27 -05:00
0x4A6F 29acc14f0d
Merge pull request #143060 from zhaofengli/binfmt-argv0
nixos/binfmt: Add QEMU wrapper to preserve argv[0]
2022-01-06 19:21:47 +01:00
Aaron Andersen ea0d11e503
Merge pull request #153745 from mohe2015/wordpress-no-directory-indexes
nixos/wordpress: Disable directory indexes
2022-01-06 13:12:54 -05:00
Moritz Hedtke bb358d6566
nixos/wordpress: Disable directory indexes
Fixes #151159
Confirmed using path http://localhost/wp-includes/
2022-01-06 18:04:19 +01:00
Aaron Andersen 45477f7ce5 nixos/caddy: add globalConfig option 2022-01-06 09:25:58 -05:00
github-actions[bot] 2bc8eed5b9
Merge master into staging-next 2022-01-06 12:01:13 +00:00
Yannick Markus 7f2bc1d736
nixos/bookstack: fix setup service 2022-01-06 11:56:43 +01:00
Robert Hensing 265fe132e6
Merge pull request #153620 from pennae/fix-installer-tests
nixos-install: copy channels before system eval
2022-01-06 11:34:55 +01:00
github-actions[bot] 10ea3f9b77
Merge master into staging-next 2022-01-06 00:02:03 +00:00
Martin Weinelt 9b708d814b
Merge pull request #153625 from Mic92/tinc 2022-01-06 00:42:57 +01:00
Jörg Thalheim 989238ec03
Merge pull request #153426 from 4z3/systemwide-pipewire
nixos/pipewire: add systemWide option
2022-01-05 21:33:07 +00:00
José Romildo Malaquias 75e9b9b058
Merge pull request #153472 from romildo/upd.ecrire
enlightenment.ecrire: init at 0.2.0
2022-01-05 16:00:50 -03:00
Wael Nasreddine 1a4a216bf5
onlykey: set the group correctly in the udev rule (#153618) 2022-01-05 10:29:37 -08:00
Jörg Thalheim db2953eb19 nixos/tinc: add mic92 maintainer 2022-01-05 19:29:01 +01:00
pennae 3ad8f52de0 nixos-install: copy channels before system eval
since fc614c37c6 nixos needs access to its
own path (<nixpkgs/nixos>) to evaluate a system with documentation.
since documentation is enabled by default almost all systems need such
access, including the installer tests. nixos-install however does not
ensure that a channel exists in the target store before evaluating the
system in that store, which can lead to `path is not valid` errors.
2022-01-05 18:38:49 +01:00
Martin Weinelt 74a4683605 Merge remote-tracking branch 'origin/master' into staging-next 2022-01-05 17:31:37 +01:00
kraem 893ffee286
Revert "nixos/documentation: avoid copying nixpkgs subpaths"
builtins.storePath is not allowed in pure evaluation mode

This reverts commit 1511e72b75.
2022-01-05 12:36:54 +01:00
github-actions[bot] 4b70e0e343
Merge master into staging-next 2022-01-05 06:01:16 +00:00
Aaron Andersen 6b1102d94b
Merge pull request #152029 from CRTified/adguard-settings
nixos/adguardhome: Add settings option
2022-01-04 19:19:18 -05:00
github-actions[bot] 89a0a771b6
Merge master into staging-next 2022-01-05 00:01:52 +00:00
Robert Hensing 70d27303da
Merge pull request #149532 from pennae/split-docs-build
nixos/*: split docs build
2022-01-04 22:33:23 +01:00
Sandro 05fb73cb9e
Merge pull request #153281 from delroth/sudo-1.9.8p2 2022-01-04 21:09:04 +01:00
Jan Tojnar dafaecb3b9 nixos/gvfs: fix libmtp udev package path for realz
bin is the primary output so the previous attempt at fixing this
(2d7fc66c79)
was a no-op.
2022-01-04 19:22:05 +01:00
tv 7678a5848c nixos/pipewire: add systemWide option 2022-01-04 16:07:07 +01:00
Patrick Hilhorst d4dc638d77
nixos/test-driver: also passthru driverInteractive 2022-01-04 14:52:37 +01:00
José Romildo 676ffe1f39 nixos/enlightenment: add ecrire to system packages 2022-01-04 09:52:56 -03:00
github-actions[bot] 36fd643041
Merge master into staging-next 2022-01-04 12:01:29 +00:00