Commit Graph

3120 Commits

Author SHA1 Message Date
zowoq
b46b3d928d nixos/podman: readd rootless runc test
use `loginctl enable-linger` to create systemd session
2021-01-21 06:57:51 +10:00
Sandro
ec84cbf95f
Merge pull request #110107 from LeSuisse/cifs-utils-missing-python3-smbinfo
cifs-utils: missing python3 dependency for smbinfo
2021-01-20 20:12:37 +01:00
Michael Weiss
ff8866e243
nixos/tests/chromium: Add ungoogled-chromium and Google Chrome
By default only `chromium` will be tested but other "channels" can be
selected using e.g.:
nix-build nixos/tests/chromium.nix -A ungoogled

This also adds me as secondary maintainer (I'd like to get notified on
PRs/issues and can review them).
2021-01-20 19:20:53 +01:00
Thomas Gerbet
5858d84658 cifs-utils: missing python3 dependency for smbinfo
Since cifs-utils 6.12, smbinfo needs Python to be usable.

Issue introduced in 033208fd46.
2021-01-20 18:39:42 +01:00
Michael Weiss
8a7a8442c1
nixos/tests/chromium: Fix a race condition
Only execute Ctrl+w to close the currently active window if the
new/secondary window (title: "New Tab") could be selected. This fixes a
test failure since the update to Chromium M88 (cc PR #110010).
Without this additional check the main window (title: "startup done")
could still be selected (and thus will be closed) and the script would
close both windows (i.e. terminate Chromium completely).
2021-01-20 16:57:46 +01:00
Robert Hensing
d51d15e1cf
Merge pull request #109665 from prusnak/stdenv-lib-nixos
nixos/modules: stdenv.lib -> lib
2021-01-19 23:50:30 +01:00
Robert Hensing
04946f4246 nixos/vault: extraConfigPaths -> extraSettingsPaths
Align with RFC42 language, even if in advance of the actual settings
attribute.
2021-01-19 18:14:29 +01:00
Thiago Kenji Okada
313ee6bd96 opentabletdriver: 0.4.2 -> 0.5.0 2021-01-19 14:05:48 -03:00
Sandro
710a84461b
Merge pull request #104920 from ThibautMarty/herbstluftwm-0.9.0 2021-01-18 23:09:46 +01:00
Christian Kampka
f0ec10a829
treewide: remove kampka as maintainer (#109813) 2021-01-18 21:23:49 +01:00
Thibaut Marty
a6cdb113bd herbstluftwm: add NixOS test 2021-01-18 16:12:52 +00:00
Sandro
4eccd6f731
Merge pull request #97449 from AberDerBart/mpd
nixos/mpd: fix not properly testing for songs to be in the playlist
2021-01-18 13:47:57 +01:00
Kevin Cox
4ee9a86405
Merge pull request #109042 from Atemu/installer-tests-more-cores
tests/installer: give installer VM more cores
2021-01-18 06:14:50 -05:00
Pavol Rusnak
66dc9dbb59
nixos/modules: stdenv.lib -> lib 2021-01-17 21:40:51 +01:00
WilliButz
254b510ce7
nixos/promtheus-nextcloud-exporter: update module and test
Use new command-line flags of release 0.3.0 and always answer with the
expected XML in the VM test instead of using a test-specific fixed path.

Co-authored-by: ajs124 <git@ajs124.de>
2021-01-17 15:25:18 +01:00
Mark Vainomaa
f53cf9a65c
Revert "nixos/tests/docker: wait for docker service"
This reverts commit c14bafd6c7db3b0c03574e28831821adda22a6f1.
2021-01-15 15:53:43 +02:00
Erik Arvstedt
9a283a038d
nixos-container: fix nixpkgs container options being ignored
Since the introduction of option `containers.<name>.pkgs`, the
`nixpkgs.*` options (including `nixpkgs.pkgs`, `nixpkgs.config`, ...) were always
ignored in container configs, which broke existing containers.

This was due to `containers.<name>.pkgs` having two separate effects:
(1) It sets the source for the modules that are used to evaluate the container.
(2) It sets the `pkgs` arg (`_module.args.pkgs`) that is used inside the container
    modules.
    This happens even when the default value of `containers.<name>.pkgs` is unchanged, in which
    case the container `pkgs` arg is set to the pkgs of the host system.
    Previously, the `pkgs` arg was determined by the `containers.<name>.config.nixpkgs.*` options.

This commit reverts the breaking change (2) while adding a backwards-compatible way to achieve (1).
It removes option `pkgs` and adds option `nixpkgs` which implements (1).
Existing users of `pkgs` are informed by an error message to use option
`nixpkgs` or to achieve only (2) by setting option `containers.<name>.config.nixpkgs.pkgs`.
2021-01-15 12:49:42 +01:00
Milan
f634c149e4
nixos/tests/docker: wait for docker service (#109418)
Previously the Docker daemon was started by systemd socket activation.
Thus, the Docker test waited for the sockets.target unit.
But when the docker module was changed to start the Docker daemon at
boot instead of by socket activation, the test was left untouched.
With the Docker 20.10 update this lead to a timing issue, where the
docker command is run before the Docker daemon has started and hangs.

Fixes #109416
2021-01-15 03:38:15 +01:00
Kevin Cox
ddad87f26a
Merge pull request #108940 from Atemu/zfs-test-with-stable-linuxPackages
tests/zfs: test stable with stable linuxPackages
2021-01-14 17:09:02 -05:00
Alyssa Ross
3893d6c6d7 gitAndTools: move everything to the top level
The comment at the top of git-and-tools/default.nix said:

    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.

but unfortunately that hasn't actually held up in practice.

Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).

So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.

The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
2021-01-14 21:27:48 +00:00
Michele Guerini Rocco
721a4ecfa6
Merge pull request #109114 from illustris/searx
searx: 0.17.0 -> 0.18.0
2021-01-14 10:15:37 +01:00
rnhmjoj
f741cccd45
nixos/searx: remove settings.yml merging script
Starting with 0.18.0, searx can merge the settings.yml automatically
with the default values, so the script is obsolete.
2021-01-14 09:48:02 +01:00
rnhmjoj
1013de19f1
nixos/searx: fix for 0.18.0 update 2021-01-14 09:48:01 +01:00
Izorkin
d688f790dd
mariadb: drop build server with tokudb storage 2021-01-12 17:22:47 +03:00
rnhmjoj
623664e84f
nixos/searx: add support for running in uWSGI 2021-01-11 08:41:15 +01:00
rnhmjoj
b7ca2d1448
nixos/tests: add searx test 2021-01-11 08:41:15 +01:00
Jan Tojnar
dd72357155
Merge branch 'master' into staging-next 2021-01-10 23:24:33 +01:00
Guillaume Girol
0fbc0976db
Merge pull request #106082 from rnhmjoj/uwsgi
nixos/uwsgi: run with capabilities instead of root
2021-01-10 21:51:37 +00:00
Sandro
d085417683
Merge pull request #108970 from xaverdh/pkgs-stdenv-lib
treewide: simplify pkgs.stdenv.lib -> pkgs.lib
2021-01-10 22:47:38 +01:00
Florian Klink
07f8292f88
Merge pull request #108844 from dadada/dadada/redis-unix-socket
nixos/redis: add test for unix socket access
2021-01-10 22:08:02 +01:00
Dominik Xaver Hörl
25bef2d8f9 treewide: simplify pkgs.stdenv.lib -> pkgs.lib
The library does not depend on stdenv, that `stdenv` exposes `lib` is
an artifact of the ancient origins of nixpkgs.
2021-01-10 20:12:06 +01:00
Atemu
71590db8fb tests/installer: give installer VM more cores
ZFS installer test runtime went from 637s to 380s on my Ryzen 3600
2021-01-10 13:45:14 +01:00
Atemu
61c0e8e657 tests/zfs: test stable with stable linuxPackages
Only unstable is supposed to be compatible with linuxPackages_latest
2021-01-10 13:24:53 +01:00
github-actions[bot]
433c7b069c
Merge master into staging-next 2021-01-10 01:03:35 +00:00
Aaron Andersen
4b0a2ac72c
Merge pull request #99559 from JamieMagee/nzbhydra2
nzbhydra2: init at 3.8.0
2021-01-09 14:23:30 -05:00
github-actions[bot]
fcbe48c797
Merge master into staging-next 2021-01-09 18:41:27 +00:00
dadada
5d0b0fcc7d
nixos/redis: add test for unix socket access
This adds a test to check if the unix socket is available to the `redis` group
added in #90027.
2021-01-09 11:40:11 +01:00
Thiago Kenji Okada
41c50cc505 nixos/opentabletdriver: add tests 2021-01-08 14:27:40 -03:00
rnhmjoj
c00240e41e
nixos/uwsgi: add support for POSIX capabilities 2021-01-07 23:17:07 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Jörg Thalheim
a14ea3aecc
Merge pull request #97740 from ju1m/tor
nixos/tor: improve type-checking and hardening
2021-01-05 16:00:40 +00:00
WORLDofPEACE
57e1a17ad0
Merge pull request #108465 from alyssais/getty
nixos/getty: rename from services.mingetty
2021-01-05 10:10:34 -05:00
Alyssa Ross
6c3d21aff9
nixos/getty: rename from services.mingetty
It's been 8.5 years since NixOS used mingetty, but the option was
never renamed (despite the file definining the module being renamed in
9f5051b76c ("Rename mingetty module to agetty")).

I've chosen to rename it to services.getty here, rather than
services.agetty, because getty is implemantation-neutral and also the
name of the unit that is generated.
2021-01-05 09:09:42 +00:00
Robert Hensing
5540dd9b9b
Merge pull request #108416 from srhb/streamlayeredimage-symlinked-storepaths
dockerTools: Fix streamLayeredImage for symlinks
2021-01-05 10:00:28 +01:00
Léo Gaspard
a7331d1403 nixos tests: fix postgresql-wal-receiver 2021-01-05 04:12:53 +01:00
Léo Gaspard
fe8ec6a07f nixos tests: fix postgresql-wal-receiver.nix's eval 2021-01-05 04:05:38 +01:00
Sarah Brofeldt
ffe5ff6009 dockerTools: Test buildLayeredImage with symlinks
This exercises layer creation in face of store path symlinks, ensuring
they are not dereferenced, which can lead to broken layer tarballs
2021-01-04 21:44:47 +01:00
Frederik Rietdijk
b20838eb4a Merge staging-next into staging 2021-01-04 20:51:32 +01:00
Robert Hensing
653f18b48f nixosTests.vault-postgresql: init 2021-01-04 19:00:30 +01:00
Robert Hensing
1eabc4cff1 nixosTests.vault: increase memorySize to 512 2021-01-04 19:00:29 +01:00
Andreas Rammhold
653f805f09 nixos/tests/dovecot: enable dovecot_pigeonhole plugin
This plugin is used commonly enough that we should ensure it still
builds (and dovecot works) after loading it.

This is not yet perfect as we aren't testing any of it's functionality
but at least we ensure that dovecot continues to do the regular job.
2021-01-04 18:17:26 +01:00
Julien Moutinho
0ccdd6f2b0 nixos/tor: improve type-checking and hardening
Fixes #77395.
Fixes #82790.
2021-01-04 01:02:26 +01:00
github-actions[bot]
07165c7226
Merge staging-next into staging 2021-01-03 18:38:32 +00:00
Maximilian Bosch
3b57908018
Merge pull request #108179 from WilliButz/update/prometheus-json-exporter/0.2.0
prometheus-json-exporter: unstable-2017-10-06 -> 0.2.0
2021-01-03 19:28:12 +01:00
Milan Pässler
12f3e2c42c nixos/tests/shadow: add switch user subtest 2021-01-03 15:54:48 +01:00
Florian Klink
4d36ba1d43
Merge pull request #108032 from andir/systemd-dlopen
systemd: patch runtime dlopen calls
2021-01-03 13:33:09 +01:00
Andreas Rammhold
37539e7768
nixos/tests/systemd-journal: ensure that --grep works
Previously, after the version bump to v247, we broke journalctl --grep
as libpcre2 was lazily loaded during runtime using dlopen(3). This
ensures that we have a test case that alerts us when it fails again.
2021-01-03 11:50:01 +01:00
Tim Steinbach
4c9414d31c hub: Add test 2021-01-02 15:43:01 -05:00
WilliButz
3f94c66ee1
nixos/prometheus-json-exporter: update modules & tests, add release notes 2021-01-02 13:10:27 +01:00
WilliButz
0587d518db
Merge pull request #107891 from lukegb/smokeping-prober
prometheus-smokeping-prober: init at 0.3.1 from git
2021-01-01 16:08:20 +01:00
WilliButz
2b04b8817e
Merge pull request #108096 from lukegb/bird-exporter
prometheus-bird-exporter: init at 1.3.5-git
2021-01-01 16:03:37 +01:00
Luke Granger-Brown
699e402705 prometheus-bird-exporter: init at 1.3.5-git 2021-01-01 04:43:59 +00:00
Luke Granger-Brown
d0a9e1ec83 nixos/grafana: add support for declarative plugin installation 2020-12-30 17:59:52 +00:00
Luke Granger-Brown
3297ac72f1 nixos/prometheus: add smokeping and corresponding NixOS test 2020-12-29 18:59:51 +00:00
Lucas Savva
bfe07e2179 nixos/acme: fix test config 2020-12-28 00:35:46 +00:00
Lucas Savva
85769a8cd8 nixos/acme: prevent mass account creation
Closes #106565
When generating multiple certificates which all
share the same server + email, lego will attempt
to create an account multiple times. By adding an
account creation target certificates which share
an account will wait for one service (chosen at
config build time) to complete first.
2020-12-28 00:35:18 +00:00
Maximilian Bosch
e5e7c9b0f9
nixos/tests/loki: satisfy linter
Apparently, the linter used for python test-scripts just decided that
a reformat of the testscript is now necessary.
2020-12-28 00:37:13 +01:00
Tim Steinbach
1d364e5138
tests/shadow: Improve
On slow hardware, the test was flaky.
This improves it.
2020-12-23 17:48:12 -05:00
WilliButz
f1584ed282
Merge pull request #107469 from Ma27/bump-prometheus
prometheus: 2.22.2 -> 2.23.0
2020-12-23 21:49:08 +01:00
Vladimír Čunát
57a787c9fa
Revert Merge #107275: nixos: fix "nixos-rebuild ...
... build-vm-with-bootloader" for EFI systems

This reverts commit 20257280d9, reversing
changes made to 926a1b2094.
It broke nixosTests.installer.simpleUefiSystemdBoot
and right now channel is lagging behing for two weeks.
2020-12-23 21:24:24 +01:00
Tim Steinbach
1539732cc6
shadow: Add test 2020-12-23 13:28:52 -05:00
Tim Steinbach
05bf935bc6
ripgrep: Add test 2020-12-23 12:30:39 -05:00
Maximilian Bosch
39ebc637a1
nixos/tests/prometheus: increase memorySize
Apparently, our NixOS tests need more RAM now. This was needed for e.g.
the `gitea`-test as well[1].

[1] affb72eccd
2020-12-23 13:08:36 +01:00
rnhmjoj
06749ba321 nixos/tests/uwsgi: test PHP plugin 2020-12-22 14:12:19 +01:00
Sandro
ca8343d1b9
Merge pull request #105781 from phile314/rm_old_kafka 2020-12-22 10:03:08 +01:00
WilliButz
1c55621706
nixos/codimd: rename to hedgedoc
CodiMD was renamed to HedgeDoc. The user, group and state directory,
will be named hedgedoc instead of codimd, starting with stateVersion
"21.03".
2020-12-22 01:39:03 +01:00
Vladimír Čunát
583470209f
Revert "Merge #97536: uwsgi: fix compiling and linking"
This reverts commit df4d0b03ef, reversing
changes made to b333263534.

It didn't even evaluate!
2020-12-21 22:48:19 +01:00
WilliButz
8fc05f7a19
Merge pull request #107292 from mguentner/nginxlog_exporter
nginxlog_exporter:  1.3.0 -> 1.8.1 + module w/ tests
2020-12-21 21:40:16 +01:00
Maximilian Güntner
65fd031277
nixos: add prometheus_nginxlog_exporter module + test 2020-12-21 21:23:39 +01:00
Léo Gaspard
a5a819e059
Merge pull request #104292 from fgaz/image-contents
nixos/lib/make-disk-image.nix: support content mode and ownership
2020-12-21 19:58:49 +01:00
Philipp Hausmann
a63c1a930f kafka: remove old versions 2020-12-21 19:46:16 +01:00
Jamie Magee
feb63511c6
nixos/nzbhydra2: init 2020-12-21 19:41:24 +01:00
rnhmjoj
c32ef2192f nixos/tests/uwsgi: test PHP plugin 2020-12-21 16:50:54 +01:00
Bjørn Forsman
39fad297fd nixos: fix "nixos-rebuild build-vm-with-bootloader" for EFI systems
`nixos-rebuild build-vm-with-bootloader` currently fails with the
default NixOS EFI configuration:

  $ cat >configuration.nix <<EOF
  {
    fileSystems."/".device = "/dev/sda1";
    boot.loader.systemd-boot.enable = true;
    boot.loader.efi.canTouchEfiVariables = true;
  }
  EOF

  $ nixos-rebuild build-vm-with-bootloader -I nixos-config=$PWD/configuration.nix -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-20.09.tar.gz
  [...]
  insmod: ERROR: could not insert module /nix/store/1ibmgfr13r8b6xyn4f0wj115819f359c-linux-5.4.83/lib/modules/5.4.83/kernel/fs/efivarfs/efivarfs.ko.xz: No such device
  mount: /sys/firmware/efi/efivars: mount point does not exist.
  [    1.908328] reboot: Power down
  builder for '/nix/store/dx2ycclyknvibrskwmii42sgyalagjxa-nixos-boot-disk.drv' failed with exit code 32
  [...]

Fix it by setting virtualisation.useEFIBoot = true in qemu-vm.nix, when
efi is needed.

And remove the now unneeded configuration in
./nixos/tests/systemd-boot.nix, since it's handled globally.

Before:
* release-20.03: successful build, unsuccessful run
* release-20.09 (and master): unsuccessful build

After:
* Successful build and run.

Fixes https://github.com/NixOS/nixpkgs/issues/107255
2020-12-21 08:55:13 +01:00
Francesco Gazzetta
8e52193721 nixosTests.image-contents: init 2020-12-20 21:24:50 +01:00
Linus Heckemann
b1fc183639
Merge pull request #97145 from lheckemann/initrd-improvements
Initrd improvements
2020-12-18 18:15:27 +01:00
Tim Steinbach
648eece4bf
yq: Add test 2020-12-18 12:07:30 -05:00
Johannes Schleifenbaum
df7a435e3e
mailhog: add simple test 2020-12-17 16:58:57 +01:00
Tim Steinbach
bc949bb67e
minecraft: Fix test 2020-12-17 09:05:53 -05:00
Linus Heckemann
3136e49b8e nixos/tests: Add test for initrd secrets
lz4 compression is excluded because it doesn't work for a reason which
remains unclear to me.
2020-12-17 11:44:25 +01:00
Markus Kowalewski
5df0cf7461
nixos/slurm: fix dbdserver config file handling
Since slurm-20.11.0.1 the dbd server requires slurmdbd.conf to be
in mode 600 to protect the database password. This change creates
slurmdbd.conf on-the-fly at service startup and thus avoids that
the database password ends up in the nix store.
2020-12-16 20:34:14 +01:00
Tim Steinbach
fc3926ea2d
Revert "minecraft: 2.2.909 → 2.2.741"
This reverts commit 8d4d8ef274.

The update script pulls the version info from AUR and they still use the old version.
Sorry...
2020-12-16 11:31:33 -05:00
Tim Steinbach
8d4d8ef274
minecraft: 2.2.909 → 2.2.741 2020-12-16 10:43:39 -05:00
Erik Arvstedt
34fcfc880b
tests/containers-custom-pkgs: improve test
- Fix name
- Remove unneeded leftovers that were copied from containers-hosts.nix
- Remove redundant 'start_all()'
2020-12-15 20:25:58 +01:00
Tim Steinbach
ba31c04641
lsd: Fix test
CLI arguments changes in 0.19.0
See https://github.com/Peltoche/lsd/issues/461
2020-12-15 09:10:34 -05:00
Robert Hensing
1b35b3d3a7
Merge pull request #106703 from terinjokes/patches/dockerTools-getArch
dockerTools: normalize arch to GOARCH
2020-12-15 12:49:34 +01:00
Thomas Tuegel
0cb7962a12
Merge pull request #106899 from ttuegel/nixos-plasma-test-kded
nixos/plasma5: test that KDED runs at startup
2020-12-15 05:15:23 -06:00
Robert Hensing
d4b7efe531 nixosTests.docker-tools-cross: init
Not everyone has a suitable remote builder set up, so the cross-compilation
tests that _include_ running the result are separate. That way, most people
can run the majority of the test suite without the extra setup.
2020-12-15 02:15:12 -08:00
Terin Stock
8f66dc94a7 dockerTools: normalize arch to GOARCH
Docker (via containerd) and the the OCI Image Configuration imply and
suggest, respectfully, that the architecture set in images matches those
of GOARCH in the Go Language document.

This changeset updates the implimentation of getArch in dockerTools to
return GOARCH values, to satisfy Docker.

Fixes: #106695
2020-12-15 02:14:01 -08:00
Linus Heckemann
c40f06022a
Merge pull request #106073 from minijackson/tinc-rfc42-and-tests
nixos/tinc: rfc42 and tests
2020-12-14 21:52:57 +01:00