JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,524 Commits 2 Branches 0 Tags 13 GiB
4c26c54454
Commit Graph

14980 Commits

Author SHA1 Message Date
Frederik Rietdijk
d688c7cd05 Merge staging-next into staging 2019-11-12 14:32:56 +01:00
adisbladis
cc562268b4
Merge pull request #73232 from etu/disable-systemwide-pulse-iso 
profiles/graphical.nix: Drop systemWide pulseaudio in iso
 2019-11-12 12:43:41 +00:00
worldofpeace
470254a6da
Merge pull request #72959 from worldofpeace/gnome-flashback-systemd 
nixos/gnome3: add gnome-flashback to systemd.packages
 2019-11-12 01:53:09 +00:00
Jan Tojnar
1569632bf8
Merge branch 'staging-next' into staging 2019-11-11 22:28:32 +01:00
worldofpeace
c9601a67a5
Merge pull request #71622 from worldofpeace/iso-no-slim 
installer: use sddm in plasma5
 2019-11-11 20:46:32 +00:00
worldofpeace
deb125271c
Merge pull request #73137 from worldofpeace/port-xmonad-test 
nixosTests.xmonad: port to python
 2019-11-11 20:23:41 +00:00
Elis Hirwing
4403cd16f9
profiles/graphical.nix: Drop systemWide pulseaudio in iso 
It's not needed since #66338 and should have been done earlier.

This is based on a follow-up on #56167.
 2019-11-11 17:07:42 +01:00
Jörg Thalheim
556a169f14
Merge pull request #73189 from flokli/python-tests-return-multiple 
nixos/tests: fix succeed() with multiple commands
 2019-11-11 13:48:45 +00:00
Aaron Andersen
d68d23bb26
Merge pull request #72767 from Izorkin/phpfpm-fix 
nixos/phpfpm: fix apply global phpOptions
 2019-11-11 07:45:28 -05:00
Florian Klink
a8e9a93493 nixos/tests: fix succeed() with multiple commands 
we previously immediately returned the first commands output, and didn't
execute any of the other commands.

Now, return the last commands output.
This should be documented in the method docstring.
 2019-11-11 13:45:11 +01:00
Florian Klink
60390c81dc
Merge pull request #72603 from flokli/ceph-tmpfiles 
nixos/ceph: run unprivileged, use state directories, handle non-initialized clusters without config switch
 2019-11-11 13:42:54 +01:00
Frederik Rietdijk
73b88e17dd Merge staging-next into staging 2019-11-11 12:09:26 +01:00
Florian Klink
848399f448
Merge pull request #72390 from flokli/bump-opensmtpd 
opensmtpd: 6.4.2p1 -> 6.6.1p1
 2019-11-11 01:56:24 +01:00
worldofpeace
ea288463db
Merge pull request #73136 from worldofpeace/port-sddm-test 
nixosTests.sddm: port to python
 2019-11-10 23:06:21 +00:00
worldofpeace
8cf9315425
Merge pull request #73135 from worldofpeace/port-lightdm-test 
nixosTests.lightdm: port to python
 2019-11-10 23:05:51 +00:00
Samuel Dionne-Riel
40f7a343e1
Merge pull request #72751 from c00w/sd_image_hydra 
sd-image: Add the compressed file path for hydra.
 2019-11-10 13:44:52 -05:00
Aaron Andersen
d2d009f4a6
Merge pull request #73080 from flokli/nixos-samba-python-tmpfiles 
nixos/samba: use tmpfiles, port test to python
 2019-11-09 21:05:50 -05:00
Daniel Kuehn
1972904fc6 nixos/ceph: Clarify comments in tests and add source reference for the bootstraping method 2019-11-09 23:35:30 +01:00
worldofpeace
488e6b7a23
Merge pull request #73059 from flokli/nixos-test-port-tinydns 
nixos/tinydns: port test to python
 2019-11-09 21:53:07 +00:00
worldofpeace
6783fdd561
Merge pull request #71416 from worldofpeace/gnome3-sound-theme 
nixos/gnome3: add sound-theme-freedesktop
 2019-11-09 21:33:49 +00:00
worldofpeace
4f2daa7b29 nixosTests.xmonad: port to python 2019-11-09 15:24:41 -05:00
worldofpeace
b2fc25fe3c nixosTests.sddm: port to python 2019-11-09 15:20:20 -05:00
worldofpeace
1132f037a1 nixosTests.lightdm: port to python 2019-11-09 15:14:56 -05:00
Peter Hoeg
954e234b98 nixos/haproxy: support hot-reload without dropping packets 2019-11-09 10:11:57 -08:00
Florian Klink
ffd0060869 nixos/ceph: use ConditionPathExists to delay ceph daemon start 
This prevents services to be started before they're initialized, and
renders the `systemd.targets.ceph.wantedBy = lib.mkForce [];` hack in
the vm tests obsolete - The config now starts up ceph after a reboot,
too.

Let's take advantage of that, crash all VMs, and boot them up again.
 2019-11-09 16:13:13 +01:00
Florian Klink
67e0777f62 nixos/ceph: run unprivileged, use StateDirectory and tmpfiles, don't pass extraServiceConfig 
Don't pass user and group to ceph, and rely on it to drop ceps, but let
systemd handle running it as the appropriate user.

This also inlines the extraServiceConfig into the makeService function,
as we have conditionals depending on daemonType there anyways.

Use StateDirectory to create directories in
/var/lib/ceph/${daemonType}/${clusterName}-${daemonId}.

There previously was a condition on daemonType being one of mds,mon,rgw
or mgr. We only instantiate makeServices with these types, and "osd" was
special.
In the osd case, test examples suggest it'd be in something like
/var/lib/ceph/osd/ceph-${cfg.osd0.name} - so it's not special at all,
but exactly like the pattern for the others.

During initialization, we also need these folders, before the unit is
started up. Move the mkdir -p commands in the vm tests to the line
immediately before they're required.
 2019-11-09 16:02:53 +01:00
Florian Klink
64c9c08302 nixos/ceph: create /etc/ceph and /var/lib/ceph via tmpfiles 
We seem to be relying on those being present during runtime anyways.
 2019-11-09 15:27:45 +01:00
Thomas Tuegel
8e639f142f
Merge pull request #71986 from mtetreault/mte/plymouth-improvements 
plymouth: Add extra config field
 2019-11-09 08:17:14 -06:00
Red Davies
62e421fbb2 nixos/httpd: module fixes enableUserDir (attendum to #72789) 2019-11-09 00:53:56 +00:00
Silvan Mosberger
3022fde292
Merge pull request #71576 from ShaRose/patch-1 
nixos/dnsdist: Add CAP_NET_BIND_SERVICE to AmbientCapabilities
 2019-11-09 00:07:09 +01:00
Florian Klink
ece9c41343 nixos/samba: port test to python 2019-11-08 23:30:09 +01:00
Florian Klink
18f9cfa1c0 nixos/samba: update module to use tmpfiles, remove samba-setup service 2019-11-08 23:25:55 +01:00
Florian Klink
3928e7f6b1
Merge pull request #73063 from minijackson/shiori-things 
shiori: update modSha256, update test to python, do more tests
 2019-11-08 23:06:06 +01:00
Florian Klink
cced569cac
Merge pull request #73049 from flokli/fix-redis-merge 
nixos/redis: fix merging
 2019-11-08 22:13:54 +01:00
worldofpeace
1d3da3befc
Merge pull request #73060 from flokli/nixos-test-port-powerdns 
nixos/powerdns: port test to python
 2019-11-08 20:48:34 +00:00
worldofpeace
9cc610c576
Merge pull request #73057 from flokli/nixos-test-port-smokeping 
nixos/smokeping: port test to python
 2019-11-08 20:47:40 +00:00
worldofpeace
0c6853c727
Merge pull request #73056 from flokli/nixos-test-port-pppd 
nixos/pppd: port test to python
 2019-11-08 20:47:05 +00:00
worldofpeace
80de79c816
Merge pull request #73046 from curiousleo/patch-1 
nixos/tests: correct arguments to get_unit_info
 2019-11-08 17:40:30 +00:00
Minijackson
26acc9e63d
nixos/tests: add shiori to all-tests.nix 2019-11-08 18:17:08 +01:00
Minijackson
725168064d
nixos/shiori: port test to python, do more tests 2019-11-08 17:54:49 +01:00
Florian Klink
caac0964bb nixos/tinydns: port test to python 2019-11-08 17:26:34 +01:00
Florian Klink
cbd9e9e01f nixos/tinydns: order service after network.target 
In cases where you boot up really quickly (like in the VM test on a
non-busy host), tinydns might want to bind before the loopback interface
is fully up. Order tinydns after network.target to fix that.
 2019-11-08 17:26:34 +01:00
Florian Klink
b0e081549e nixos/powerdns: port test to python 2019-11-08 17:19:23 +01:00
Florian Klink
85bf23bb12 nixos/smokeping: port test to python 
cc #72828
 2019-11-08 17:13:48 +01:00
Florian Klink
24b540d3ce nixos/pppd: port test to python 2019-11-08 17:11:11 +01:00
Silvan Mosberger
9fe4e06812 nixos/systemd: Allow unit options to have multiple equal defs (#73024) 
E.g. this allows

  systemd.services.<name?>.serviceConfig.DynamicUser =
    mkMerge [ true true ];
 2019-11-08 15:45:44 +00:00
Florian Klink
6303131eb9 nixos/redis: fix merging 
https://github.com/NixOS/nixpkgs/pull/71584 did merging without mkMerge.

cc @jtojnar
 2019-11-08 15:38:06 +01:00
Florian Klink
1c5bfddbc9 nixos/opensmtpd: convert test to python 2019-11-08 15:19:43 +01:00
Florian Klink
e349b6e0fe nixos/opensmtpd: refactor to use tmpfiles to set up spool directories 2019-11-08 15:05:18 +01:00
Leonhard Markert
c7becac738
nixos/tests: correct arguments to get_unit_info 2019-11-08 15:01:42 +01:00