Archive/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-20 11:11:43 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
184595 commits 220 branches 122 tags 7.2 GiB
Commit graph

13351 commits

Author SHA1 Message Date
Frederik Rietdijk dafee3d91a Merge master into staging-next 2019-06-23 15:38:41 +02: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
Vladimír Čunát 3e4b15f0c4
Merge branch 'master' into staging-next 
Hydra nixpkgs: ?compare=1526638
 2019-06-22 14:35:35 +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
Frederik Rietdijk 72d647f3d8 Merge master into staging-next 2019-06-21 08:20:26 +02:00
Peter Hoeg 28563ef5cb libvirtd (nixos): support bridging for user sessions 2019-06-21 11:11:48 +08: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
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
Izorkin eee87b460e nixos/phpfpm: remove options services.phpfpm.poolConfigs 2019-06-17 09:15:51 +03:00
Izorkin 6093c04b67 nixos/tt-rss: fix work with phpfpm-rootless mode 2019-06-17 09:15:48 +03: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 a0aff40f65 make-ext4-fs: Allows populating with custom files 
This will allow adding /boot files to the rootfs.
 2019-06-16 17:47:30 -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
Izorkin 6290bf9067 nixos/selfoss: fix work with phpfpm-rootless mode 2019-06-16 12:33:51 +03:00
Izorkin d44f759b55 nixos/restya-board: fix work with phpfpm-rootless mode 2019-06-16 12:33:51 +03:00
Izorkin 5b1a4730bc nixos/nextcloud: fix work with phpfpm-rootless mode 2019-06-16 12:33:51 +03:00
Izorkin 08dae69741 nixos/matomo: fix work with phpfpm-rootless mode 2019-06-16 12:33:51 +03:00
Izorkin 5d3805487a nixos/zoneminder: fix work with phpfpm-rootless mode 2019-06-16 12:33:51 +03:00
Izorkin 2172419101 nixos/icingaweb2: fix work with phpfpm-rootless mode 2019-06-16 12:33:51 +03:00
Izorkin d49857a885 nixos/limesurvey: fix work with phpfpm-rootless mode 2019-06-16 12:33:51 +03:00
Izorkin 59a33f25e5 nixos/roundcube: fix work with phpfpm-rootless mode 2019-06-16 12:33:51 +03:00
Izorkin 320e8ab5d7 nixos/phpfpm: do not run anything as root 2019-06-16 12:33:49 +03: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
Jan Tojnar c96ee919cf
flatpak-builder: 1.0.6 -> 1.0.7 (#62413) 
flatpak-builder: 1.0.6 -> 1.0.7
 2019-06-16 01:39:09 +02:00
Jan Tojnar ccc6ffe2dc
flatpak-builder: add installed tests 2019-06-16 01:22:12 +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
Aaron Andersen 3fabe1accb nixos/release-notes: add entry for phabricator 2019-06-15 07:02:11 -04: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
Yegor Timoshenko d089f23390
Merge pull request #62853 from samueldr/fix/sshd-cross-compile-issue 
nixos/sshd: fixes validation for cross-compilation
 2019-06-15 10:37:35 +03:00
Frederik Rietdijk 31f22a5bb3 Merge staging-next into staging 2019-06-15 08:43:33 +02:00
Frederik Rietdijk 087b87758e Merge master into staging-next 2019-06-15 08:17:58 +02:00
Samuel Dionne-Riel 861bbbcb3c nixos/sshd: fixes validation for cross-compilation 
See https://github.com/NixOS/nixpkgs/pull/62853
 2019-06-15 00:56:42 -04:00
Samuel Dionne-Riel 8c14a6f641
Merge pull request #63135 from Ma27/captive-browser-regression 
nixos/captive-browser: fix module
 2019-06-14 21:29:26 -04:00
Florian Klink e0818a1530
nixos/systemd: enable systemd-tmpfiles-setup and -clean for user sessions (#62813) 
nixos/systemd: enable systemd-tmpfiles-setup and -clean for user sessions
 2019-06-14 22:43:15 +02:00
Maximilian Bosch d9f7bac91f
nixos/captive-browser: fix module 
Fixes the broken metrics evaluation which was caused by a `trace`
warning in stdout which confused `jq` in `pkgs/top-level/metrics.nix`.

Also made the `bind-device` feature optional as suggested after the
merge.
 2019-06-14 20:38:33 +02:00
Vladimír Čunát 788261a1a9
Merge branch 'master' into staging-next 
Brings in Haskell rebuild.
Hydra nixpkgs: ?compare=1525186
 2019-06-14 17:47:23 +02:00
aszlig c26584f1e5
nixos: Fix build of manual 
Manual build broken by 79f7f89442, which
is part of pull request #59179 (Fix Cassandra, improve config and
tests).

The issue was just a small error because of an unbalanced <literal/>
tag, so only a "/" was missing :-)

Signed-off-by: aszlig <aszlig@nix.build>
Cc: @aanderse
 2019-06-14 05:36:06 +02:00
Aaron Andersen fadceeb075
Merge pull request #59179 from JohnAZoidberg/cassandra-module 
Fix Cassandra, improve config and tests
 2019-06-13 20:37:10 -04:00
Aaron Andersen a49b546c92 nixos/httpd: remove unmaintained subservice (phabricator) 2019-06-13 17:12:13 -04:00
Aaron Andersen e278ff48bc nixos/phd: remove unmaintained service 2019-06-13 17:09:45 -04:00
Aaron Andersen b2ce867a91 phabricator: remove unreferenced test 2019-06-13 17:09:02 -04:00
Lasse Blaauwbroek 0515392ed3 Fix ddclient extraConfig 
The the extraConfig variable is added below the domain variable in the
ddclient config file. The domain variable should always be last.

(cherry picked from commit ba0ba6dc79)
 2019-06-13 18:25:59 +02:00
Wout Mertens 7938c1613d
kernel.nix: boot.vesa implies nomodeset 
Without nomodeset the console is reset to 80x25 after Grub
 2019-06-13 17:58:08 +02:00
Maximilian Bosch d1990cff8d
Merge pull request #58036 from volth/captive-browser 
nixos/programs.captive-browser: init
 2019-06-13 14:05:13 +02:00
Danylo Hlynskyi e718eb6243
Merge pull request #62712 from danbst/module-conflict-naming 
NixOS module system: improve one of error messages
 2019-06-13 11:59:54 +03:00
Daniel Schaefer 03503121da nixos/cassandra: Don't force SimpleSeedProvider 
If the `seedAddresses` is not set, don't force `SimpleSeedProvider` to
be in `seed_provider`. This could cause problems in a multi-datacenter
deployment when a different seed provider is preferred.
 2019-06-13 04:36:42 +02:00
Daniel Schaefer 8e5ba87b36 nixos/cassandra: Test remote auth only on v3.11+ 
Below that it works but only when supplying a custom password file with
restricted permissions (i.e. outside the nix-store). We can't do that
using an absolute path in the tests.
 2019-06-13 04:36:41 +02:00
Daniel Schaefer 79f7f89442 nixos/cassandra: Use docbook instead of markdown style 2019-06-13 04:36:41 +02:00
Daniel Schaefer 9ecd584785 nixos/cassandra: Add option for password file path 
If you're on a multi user system you don't want to have the password in
the nix-store. With the new jmxRolesFile option you can specify your own
protected file instead.
 2019-06-13 04:36:41 +02:00
Daniel Schaefer 7d646f2605 nixos/cassandra: Test jmxRoles 2019-06-13 04:36:41 +02:00
Daniel Schaefer 3162f45388 nixos/cassandra: Test maxHeapSize 2019-06-13 04:36:41 +02:00
Daniel Schaefer 2368345052 nixos/cassandra: Set test VM IPs statically 2019-06-13 04:36:41 +02:00
Daniel Schaefer 545ac1820f nixos/cassandra: Test seedAddresses 2019-06-13 04:36:41 +02:00
Daniel Schaefer 2d014f4448 nixos/cassandra: Test clusterName 2019-06-13 04:36:41 +02:00
Daniel Schaefer 4c880fd742 nixos/cassandra: Use ipAddress and capital letters 2019-06-13 04:36:41 +02:00
Daniel Schaefer 35531f4016 nixos/cassandra: Allow setting JMX credentials 
If we have the ability to enable remote JMX we should also support
setting credentials for that because they become required if you turn it
on.
 2019-06-13 04:36:41 +02:00
Daniel Schaefer 2bcca9271a nixos/cassandra: Reenable tests 2019-06-13 04:36:41 +02:00
Daniel Schaefer 6778ee1862 nixos/cassandra: Fix test by listening on IP 
Seems like you can't have a node as its own seed when it's listening on
an interface instead of an IP. At least the way it was done in the
test doesn't work and I can't figure out any other way than to just
listen on the IP address instead.
 2019-06-13 04:36:41 +02:00
Daniel Schaefer c1991fb18d nixos/cassandra: Add clusterName 2019-06-13 04:36:41 +02:00
Daniel Schaefer f0031432ce nixos/cassandra: Add nixos conf for Java env 2019-06-13 04:36:40 +02:00
Daniel Schaefer 746b82bd4a nixos/cassandra: Allow setting of seed addresses 
Allow for more intuitive specifying of seed node addresses with Nix
syntax.
 2019-06-13 04:34:03 +02:00
Daniel Schaefer a2aa01be0c nixos/cassandra: Enable CQL server by default 
Resolves #50954
 2019-06-13 04:34:03 +02:00
Maximilian Bosch 401360e15b
Merge pull request #61923 from aanderse/gitea 
nixos/gitea: make use of declarative features where applicable
 2019-06-13 01:01:18 +02:00
Wael Nasreddine da3ec20a72
Merge pull request #63035 from rvolosatovs/update/go 
go: 1.12.5->1.12.6, 1.11.10->1.11.11
 2019-06-12 08:50:39 -07:00
Eelco Dolstra 734b3e7758
Merge pull request #62966 from bjornfor/nixos-generate-config-bcache 
nixos-generate-config: add support for bcache
 2019-06-12 10:06:17 +02:00
Frederik Rietdijk 7953a65269 Merge staging-next into staging 2019-06-12 09:24:00 +02:00
Frederik Rietdijk 7184efb40a Merge master into staging-next 2019-06-12 09:22:07 +02:00
Franz Pletz 9b2ee2c057
Merge pull request #62838 from mayflower/fix/cryptsetup-kernel-crypto 
cryptsetup: enable kernel crypto api support again
 2019-06-12 05:05:38 +00:00
Robin Gloster 68c30f0d9b
Merge pull request #62153 from WilliButz/avahi-refactor 
avahi: set service directory and refactor module
 2019-06-11 14:04:33 +00:00