Jan Tojnar
07d1d3ed68
Merge branch 'master' into staging
2019-06-25 18:06:43 +02:00
Eelco Dolstra
aef7f1b31a
Typo
2019-06-25 14:46:04 +02:00
Domen Kožar
e8916cc6af
duplicati: allow changing the user
2019-06-25 14:28:03 +02:00
Aaron Andersen
931921664f
Merge pull request #63392 from ivan/cassandra-default-cluster-name
...
nixos/cassandra: use cassandra's default cluster name "Test Cluster"
2019-06-25 07:18:10 -04:00
Samuel Dionne-Riel
6bc2d30ee3
Merge pull request #62462 from samueldr/sd-image/fat-free
...
sd-image: FAT free /boot
2019-06-24 14:53:49 -04:00
Samuel Dionne-Riel
7c819989f9
Merge pull request #63147 from samueldr/aarch64/graphics-fixes
...
aarch64: misc. graphical boot fixes
2019-06-24 14:53:01 -04:00
Samuel Dionne-Riel
c4a12ee9c0
Merge pull request #62852 from samueldr/fix/xterm-desktop-manager-default
...
nixos/desktop-managers/xterm: Defaults to xserver's state
2019-06-24 14:48:58 -04:00
Matthew Bauer
500c13ed46
Merge pull request #63609 from tokudan/udev-executable-check
...
udev: change error message if RUN entry is not executable
2019-06-23 21:43:31 -04:00
Matthew Bauer
8768d1c83a
nixos: add hardware/network/intel-2200bg.nix to module-list
...
this is referenced by nixos-generate-config.pl. See
https://github.com/NixOS/nixpkgs/pull/63091 for more discussion.
2019-06-23 20:30:27 -04:00
Matthew Bauer
9d9b98cdfb
Merge pull request #62891 from jtojnar/nixos-documentation-nixos-help-use-w3m-1-by-default
...
nixos/documentation: nixos-help: use w3m(1) by default
2019-06-22 21:37:22 -04:00
Domen Kožar
c687da8940
duplicati: change default interface to 127.0.0.1 for a saner default
...
Existing 'lo' didn't work for me as it was failing to assign an IP.
2019-06-22 20:26:18 +02:00
Domen Kožar
224a6562a4
Add configurationLimit to systemd-boot to prevent running out of disk space
...
Refs #23926
2019-06-22 20:11:11 +02:00
Daniel Frank
b40a38fe8a
udev: be more verbose about the error
2019-06-21 18:05:14 +02:00
Daniel Frank
f8cf9de7ce
udev: change error message if RUN entry is not executable
2019-06-21 11:27:56 +02:00
Silvan Mosberger
852fe410fc
nixos/zfs: Remove requestEncryptionCredentials assertion
...
zfs >= 0.8 supporting encryption is now stable
2019-06-21 03:33:09 +02:00
Ivan Kozik
41c6d7adfc
nixos/prometheus-node-exporter: fix systemd unit for systemd 242 ( #63540 )
...
Avoid having a backslash at the end of ExecStart=.
See https://github.com/NixOS/nixpkgs/issues/63533 for details
about the change to systemd's unit parser.
Fixes #63383 .
2019-06-20 17:04:36 -04:00
Matthew Bauer
2b8ea614b8
Merge pull request #63090 from NixOS/nomodeset
...
kernel.nix: boot.vesa implies nomodeset
2019-06-20 15:31:17 -04:00
Matthew Bauer
808d6fc7de
Merge pull request #63087 from matthiasbeyer/fix-ddclient-extraconfig
...
Fix ddclient extraConfig
2019-06-20 15:28:04 -04:00
worldofpeace
d672ceeb68
Merge pull request #63204 from michaelpj/imp/localtime-upstream
...
localtime: use upstream unit, fix polkit rules
2019-06-19 08:38:03 -04:00
Eelco Dolstra
7eb332af5d
Remove default value for nixpkgs.system
...
Using "builtins.currentSystem" doesn't work in pure evaluation mode,
and even when it's explicitly set (which it always is, in
nixos/lib/eval-config.nix), it breaks manual generation because the
manual tries to render the default value.
2019-06-19 14:07:45 +02:00
Michael Peyton Jones
0073c1fb0b
localtime: use upstream unit and fix polkit rule installation
...
Also don't allocate a user - the upstream unit uses DynamicUser.
2019-06-19 11:07:44 +01:00
Aaron Andersen
93412bc35f
Merge pull request #63413 from etu/gitea-183-update
...
gitea: 1.8.2 -> 1.8.3
2019-06-19 05:46:48 -04:00
Elis Hirwing
3576ba7c19
nixos/gitea: Add missing tmpfiles rules
2019-06-19 07:45:51 +02:00
Frederik Rietdijk
f120248daf
Merge staging-next into staging
2019-06-18 11:07:56 +02:00
Frederik Rietdijk
41377252e5
Merge master into staging-next
2019-06-18 10:53:28 +02:00
Jan Tojnar
1ef7e40a9c
doc: Clean up programlisting & screen ( #63316 )
...
doc: Clean up programlisting & screen
2019-06-18 09:47:15 +02:00
Vladimír Čunát
0aa9f35a99
Merge branch 'master' into staging-next
...
Hydra nixpkgs: ?compare=1525828
2019-06-18 09:44:13 +02:00
Ivan Kozik
a476b9bf54
nixos/cassandra: use cassandra's default cluster name "Test Cluster"
...
The change to "NixOS Test Cluster" in #59179 broke startup of existing clusters
that used the previously-default cluster name "Test Cluster":
ERROR 23:00:47 Fatal exception during initialization
org.apache.cassandra.exceptions.ConfigurationException: Saved cluster name Test Cluster != configured name NixOS Test Cluster
Fixes #63388 .
2019-06-18 00:36:46 +00:00
Matthew Bauer
4d6f65b81f
Merge pull request #62167 from matthewbauer/alias-libgl
...
Add libGL* aliases
2019-06-17 15:18:29 -04:00
Matthew Bauer
263f5891b6
treewide: mesa_noglu, mesa_drivers, libGL_driver -> mesa
...
Just use mesa for these to be more clear. Move these to aliases.nix
2019-06-17 14:43:18 -04:00
Jörg Thalheim
55e2c850a3
nixos/kvmgt: fix starting condition ( #62096 )
...
nixos/kvmgt: fix starting condition
2019-06-17 16:32:54 +01:00
Jan Tojnar
a3f2131eb6
doc: Use prompt more often
2019-06-17 13:25:50 +02:00
Jan Tojnar
11cb382a4c
nixos/doc: Fix spurious indentation
2019-06-17 12:28:26 +02:00
Samuel Dionne-Riel
288118cdfa
sd-image: Adds removed options for removed options
...
This will keep configuration configuring the size of the /boot partition
still build, while showing the deprecation warning.
In 99.9% of cases I assume ignoring the configuration is better, as the
sd-image builder already is pretty opinionated in that matter.
2019-06-16 17:47:32 -04:00
Samuel Dionne-Riel
c113c094cf
sd-image: Pull less slack in the image by accounting for slack
...
The slack, seemingly, accounted for more than the minimum required for
slack plus the two partitions.
This change makes the gap a somewhat abstracted amount, but is not
configurable within the derivation.
2019-06-16 17:47:31 -04:00
Samuel Dionne-Riel
1843e00146
sd-image: Updates comments
2019-06-16 17:47:31 -04:00
Samuel Dionne-Riel
8634d5700d
sd-image: firmware partition reduced to 20MiB
2019-06-16 17:47:31 -04:00
Samuel Dionne-Riel
53884e1b94
sd-image: Switch /boot to the ext4 partition
2019-06-16 17:47:31 -04:00
Samuel Dionne-Riel
6e9e78b618
sd-image: Moves /boot
into rootfs
...
The current FAT32 partition is kept as it is required for the Raspberry
Pi family of hardware. It is where the firmware is kept.
The partition is kept bootable, and the boot files kept in there until
the following commits, to keep all commits of this series individually
bootable.
2019-06-16 17:47:30 -04:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Bjørn Forsman
8f551be935
nixos-generate-config: don't emit tmpfs entry for /tmp
...
Because it most likely comes from the boot.tmpOnTmpfs option in
configuration.nix (managed declaratively).
2019-06-16 16:21:54 +02:00
Bjørn Forsman
4213e48dd9
nixos-generate-config: add dm-snapshot module if LVM is detected
...
Without this, the system becomes unbootable if the user creates a LVM
snapshot and reboots.
Fixes https://github.com/NixOS/nixpkgs/issues/33646
(The same kind of problem was fixed in RHEL a few years back:
https://bugzilla.redhat.com/show_bug.cgi?id=1287940 )
2019-06-16 15:30:54 +02:00
Bjørn Forsman
9e45f6feac
nixos-generate-config: don't generate swapDevices for *files*
...
Up until now, the output has been the same for swap devices and swap
files:
{ device = "/var/swapfile"; }
Whereas for swap *files* it's easier to manage them declaratively in
configuration.nix:
{ device = "/var/swapfile"; size = 8192; }
(NixOS will create the swapfile, and later resize it, if the size
attribute is changed.)
With the assumption that swap files are specified in configuration.nix,
it's silly to output them to hardware-configuration.nix.
2019-06-16 15:26:33 +02:00
Frederik Rietdijk
7adbdd9758
Merge master into staging-next
2019-06-16 09:04:24 +02:00
Jan Tojnar
b1ee53d87b
nixos/enlightenment: fix build with config.allowAliases=false ( #61421 )
...
nixos/enlightenment: fix build with config.allowAliases=false
2019-06-16 04:07:26 +02:00
Samuel Dionne-Riel
5d92d16b49
sd-image-aarch64: Allows early modesetting for Allwinner boards
...
This will reduce the confusion at boot, where the only thing visible is
the last message from u-boot; where it looks like the board is
hung, while in reality it's likely resizing partitions.
2019-06-15 14:26:21 -04:00
Samuel Dionne-Riel
390f2071df
sd-image-aarch64: Allows early modesetting for the Raspberry Pi
...
This will reduce the confusion at boot, where the only thing visible is
the last message from u-boot; where it looks like the Raspberry Pi is
hung, while in reality it's likely resizing partitions.
2019-06-15 14:26:20 -04:00
Frederik Rietdijk
395da1280e
Merge pull request #63100 from aanderse/phabricator-remove
...
drop unmaintained phabricator package, service, and httpd subservice
2019-06-15 13:08:48 +02:00
Frederik Rietdijk
482c74cfb8
Merge staging into staging-next
2019-06-15 10:49:30 +02:00
Frederik Rietdijk
9bd6c5d817
Merge staging-next into master
2019-06-15 10:46:55 +02:00