Edmund Wu
00f7558225
Revert "libinput: ensure that we only apply touchpad options to touchpads"
...
This reverts commit 912a58428c71ca73426c25c9d4eac69f119a0517.
2020-06-20 20:46:17 -04:00
Samuel Dionne-Riel
f203b8b277
Merge pull request #90119 from samueldr/feature/rpi4-fixups
...
Fix some pitfalls from the Raspberry Pi 4 specific sd image
2020-06-20 17:02:51 -04:00
Michael Raskin
132ace5fe6
Merge pull request #89344 from JJJollyjim/openresty-no-perl
...
openresty: disable perl module by default
2020-06-20 18:45:44 +00:00
Michele Guerini Rocco
1eef920a8d
Merge pull request #91128 from bbigras/rslsync-localhost
...
nixos/resilio: listen on [::1] by default
2020-06-20 20:43:04 +02:00
Bruno Bigras
dbb5bdfa09
nixos/resilio: listen on [::1] by default
2020-06-20 14:28:23 -04:00
Maximilian Bosch
c9462630bd
Merge pull request #91149 from nlewo/nextcloud-expose-occ
...
nixos/nextcloud: add occ internal option
2020-06-20 19:28:25 +02:00
Marek Mahut
0ff1bdb7c0
Merge pull request #90884 from mmahut/wasabi
...
nixos/wasabibackend: init 1.1.11.1
2020-06-20 15:30:32 +02:00
Graham Christensen
5d0725a063
Revert "Merge nixos-hardware into nixpkgs under /nixos/hardware
"
2020-06-20 08:21:15 -04:00
Profpatsch
cc0bf76d2f
Merge pull request #91160 from Profpatsch/nixos-hardware-merge
...
Merge nixos-hardware into nixpkgs under `/nixos/hardware`
2020-06-20 14:02:35 +02:00
lewo
2fd146f6ae
Merge pull request #89427 from Ma27/nextcloud19
...
nextcloud19: init at 19.0.0
2020-06-20 13:59:47 +02:00
Profpatsch
2c282fb537
nixos/hardware: remove .travis.yml
...
We are going to have to integrate the tests differently, but it’s fine
for now.
2020-06-20 13:26:51 +02:00
Symphorien Gibol
4593482d4e
nixos: add test for sslh
2020-06-20 13:24:19 +02:00
Profpatsch
b89f6adb84
nixos/hardware: remove .gitignore
...
It’s a full subset of the toplevel .gitignore.
2020-06-20 13:06:18 +02:00
Profpatsch
ba2dcbce23
nixos/hardware: move CODEOWNERS to toplevel
2020-06-20 13:05:20 +02:00
Profpatsch
ef3f3a4eb0
Merge branch 'nixos-hardware-merge-preparations' into nixos-hardware-merge
...
Merges https://github.com/NixOS/nixos-hardware into nixpkgs.
This will give better discoverability, and considering the low
turnover (less than 100 commits in the last year and only 350 total)
it won’t make any dent on the size of nixpkgs.
We have a monorepo, let’s use it
2020-06-20 12:57:47 +02:00
Profpatsch
b9a7e21ef6
nixos-hardware: prepare for merge by moving to nixos/hardware
...
It is going to be merged into nixpkgs, under `nixos/hardware`.
This will give better discoverability, and considering the low
turnover (less than 100 commits in the last year and only 350 total)
it won’t make any dent on the size of nixpkgs.
We have a monorepo, let’s use it.
2020-06-20 12:55:55 +02:00
Symphorien Gibol
433f227f70
nixos/sslh: make it possible (and the default) to listen on ipv6
2020-06-20 12:54:36 +02:00
Jörg Thalheim
26e9a3498b
nixos/home-assistant: make service reloadable
...
This allows quick reloads using the following trick:
$(nix-build --show-trace --no-out-link \
-E '(with import <nixpkgs/nixos> {};
pkgs.writeScript "update-hass-config"
config.systemd.services.home-assistant.preStart)')
systemctl reload home-assistant
2020-06-20 10:31:27 +01:00
Maximilian Bosch
f326e5a35e
nixos/nextcloud: update upgrade-path for nextcloud19
...
Enhance the heuristics to make sure that a user doesn't accidentally
upgrade across two major versions of Nextcloud (e.g. from v17 to v19).
The original idea/discussion has been documented in the nixpkgs manual[1].
This includes the following changes:
* `nextcloud19` will be selected automatically when having a stateVersion
greater or equal than 20.09. For existing setups, the package has to
be selected manually to avoid accidental upgrades.
* When using `nextcloud18` or older, a warning will be thrown which recommends
upgrading to `nextcloud19`.
* Added a brief paragraph about `nextcloud19` in the NixOS 19.09 release
notes.
* Restart `phpfpm` if the Nextcloud-package (`cfg.package`) changes[2].
[1] https://nixos.org/nixos/manual/index.html#module-services-nextcloud-maintainer-info
[2] https://github.com/NixOS/nixpkgs/pull/89427#issuecomment-638885727
2020-06-20 11:30:11 +02:00
Michele Guerini Rocco
34f19a4686
Merge pull request #86253 from erictapen/printers-example
...
nixos/printers: fix example for hardware.printers.ensurePrinters.*.model
2020-06-20 10:15:30 +02:00
Michele Guerini Rocco
fe1245d555
Merge pull request #87270 from martinetd/mpd-fluidsynth
...
mpd: add services.mpd.fluidsynth option
2020-06-20 10:14:06 +02:00
Antoine Eiche
7d994ad445
nixos/nextcloud: add occ internal option
...
This option exposes the prefconfigured nextcloud-occ
program. nextcloud-occ can then be used in other systemd services or
added in environment.systemPackages.
The nextcloud test shows how it can be add in
environment.systemPackages.
2020-06-20 09:59:27 +02:00
Michele Guerini Rocco
41e1bd6021
Merge pull request #90635 from Twey/libinput-touchpad
...
libinput: ensure that we only apply touchpad options to touchpads
2020-06-20 09:58:47 +02:00
Michele Guerini Rocco
003bf184c0
Merge pull request #91116 from bbigras/rslsync-group
...
nixos/resilio: fix group name in documentation
2020-06-20 09:54:17 +02:00
Frederik Rietdijk
9c5e7367d1
Merge master into staging-next
2020-06-20 07:38:17 +02:00
Evils
73a90b0154
nixos/tuptime: change group/user to match upstream
2020-06-20 05:34:37 +02:00
Timo Kaufmann
4843eab3a1
Merge pull request #84135 from symphorien/btrfs-scrub-success
...
nixos/btrfs autoScrub: don't fail when scrub finishes successfully
2020-06-19 22:55:19 +02:00
Maximilian Bosch
a2a5aa2634
nextcloud19: init at 19.0.0
...
https://nextcloud.com/blog/nextcloud-hub-brings-productivity-to-home-office/
2020-06-19 22:16:52 +02:00
Bruno Bigras
ad13beeebc
nixos/resilio: fix group name in documentation
2020-06-19 15:15:33 -04:00
Marek Mahut
d07ba3e962
nixos/wasabibackend: fixing description
...
Co-authored-by: 1000101 <b1000101@pm.me>
2020-06-19 20:07:55 +02:00
Alyssa Ross
4e69b0a899
Merge pull request #89744 from vojta001/traefik-indent-config
...
traefik: unify TOML generation
2020-06-19 15:23:55 +00:00
Marek Mahut
75e1819394
tests/wasabibackend: init
2020-06-19 16:44:21 +02:00
Marek Mahut
b62df8ab46
nixos/wasabibackend: init
2020-06-19 16:44:21 +02:00
Robert Hensing
06469493de
Merge pull request #91085 from hercules-ci/fix-dockerTools-nix-symlinks
...
Fix docker tools nix symlinks
2020-06-19 12:01:47 +02:00
Frederik Rietdijk
e4cd7a48f3
Merge staging-next into staging
2020-06-19 10:49:25 +02:00
Robert Hensing
caf47063b4
dockerTools: test that tar keeps nix binary symlinks intact
2020-06-19 10:08:34 +02:00
Linus Heckemann
aea806b8ea
Merge pull request #86177 from mayflower/mailman-upstream
...
Mailman refactor
2020-06-19 07:54:41 +02:00
Euan Kemp
460c0d608f
nixos-install: error out if $mountPoint has bad permissions
...
The nix store more-or-less requires o+rx on all parent directories.
This is primarily because nix runs builders in a uid/gid mapped
user-namespace, and those builders have to be able to operate on the nix
store.
This check is especially helpful because nix does not produce a helpful
error on its own (rather, creating directories and such works, it's not
until 'mount --bind' that it gets an EACCES).
Helps users who run into this opaque error, such as in #67465 .
Possibly fixes that issue if bad permissions were the only cause.
2020-06-18 20:10:26 -07:00
Florian Klink
a84cbb60f0
Merge pull request #91073 from danielfullmer/systemd-string-format
...
nixos/systemd-boot: fix incorrect string formatting
2020-06-19 02:23:25 +02:00
Daniel Fullmer
1d4dc149df
nixos/systemd-boot: fix incorrect string formatting
...
Currently, this always writes "default nixos-generation-%d.conf" without
replacing the "%d" in the string.
Python .format() is not equivalent to "%"
2020-06-18 19:58:50 -04:00
Florian Klink
757ba1931f
Merge pull request #91068 from flokli/nixos-systemd-unit-path-types
...
nixos/systemd: allow str in systemd.services.<name>.path
2020-06-19 00:25:32 +02:00
Florian Klink
f5f8b08f16
Merge pull request #91065 from Infinisil/move-fontultimate
...
nixos/fontconfig: Move deprecated ultimate removals to relevant module
2020-06-19 00:07:46 +02:00
Florian Klink
1c9e02b911
nixos/systemd: allow str in systemd.services.<name>.path
...
Turns out, #75510 was too restrictive.
We also need to allow str here, as some modules set this to
"/run/wrappers" to bring `/run/wrappers/bin` into $PATH of a unit.
2020-06-19 00:02:51 +02:00
Florian Klink
c1e7366483
Merge pull request #75510 from helsinki-systems/systemd-path-type
...
nixos/systemd: Use a proper type for unit paths
2020-06-18 23:50:42 +02:00
Silvan Mosberger
78453e6ba6
nixos/fontconfig: Move deprecated ultimate removals to relevant module
...
This was a mistake in https://github.com/NixOS/nixpkgs/pull/61570 , this
does not belong to prometheus
2020-06-18 23:12:18 +02:00
Florian Klink
e051dab9ff
Merge pull request #91043 from flokli/buildbot-reporters
...
nixos/buildbot-master: support reporters, migrate away from status
2020-06-18 23:00:44 +02:00
Linus Heckemann
d5cc8fb892
nixos/mailman: fix search index location
2020-06-18 17:23:34 +02:00
Linus Heckemann
176bc68a69
mailman: log to journal
2020-06-18 17:23:33 +02:00
Linus Heckemann
3dbbc786f5
nixos/mailman: RFC42-ise
2020-06-18 17:23:33 +02:00
Linus Heckemann
1b8af3e1ae
nixos/mailman: fix clearing static files
2020-06-18 17:23:33 +02:00