cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
301310 commits 1 branch 0 tags 3.7 GiB
Commit graph

22323 commits

Author SHA1 Message Date
Robert Schütz
a3d043387f nixos/tests/home-assistant: don't test package 
The modules overrides extraComponents which leads to a costly rebuild of
the home-assistant package with all tests.  Make it less costly by not
running the tests, as does the default for the package option.  The
package's tests are already run by ofborg on every pull request as well
as by Hydra when building home-assistant.
 2021-06-28 14:34:18 +02:00
github-actions[bot]
e6001bb168
Merge master into staging-next 2021-06-28 12:05:19 +00:00
Elis Hirwing
536cb54f81
Merge pull request #127989 from ymatsiuk/appgate 
appgate-sdp: minimize and improve derivation
 2021-06-28 10:28:10 +02:00
github-actions[bot]
ac92955702
Merge master into staging-next 2021-06-28 06:04:15 +00:00
Maciej Krüger
b877b70d32
Merge pull request #125366 from mkg20001/vbox-export-params 2021-06-28 06:58:01 +02:00
Maciej Krüger
bb62664a1a
Merge pull request #128473 from jerith666/globalprotect-vpn 2021-06-28 05:51:26 +02:00
Maciej Krüger
8ae5ade468
Merge pull request #112654 from 1000101/matomo 
nixos/matomo: add periodicArchiveProcessingUrl option
 2021-06-28 05:39:14 +02:00
Matt McHenry
74281b9faa globalprotect-vpn: add missing 'mkIf cfg.enable' 
spotted by @lopsided98
 2021-06-27 21:55:14 -04:00
kat witch
89d2723820
nixos/fvwm: gestures -> enableGestures as of #118256 2021-06-27 22:17:15 +01:00
github-actions[bot]
c04f4806d3
Merge staging-next into staging 2021-06-27 18:05:17 +00:00
Dima
0a977cf125 nixos/duplicity: fix typo in subcommand 
In https://github.com/NixOS/nixpkgs/pull/120622 cleanup options were
added, but `remove-all-inc-of-but-n-full` was misspelled and as such
was not functioning.
 2021-06-27 09:40:35 +02:00
Jacob Hrbek
9e166662e0 localBinInPath: Initial commit 2021-06-27 07:31:45 +00:00
github-actions[bot]
1016b5a6ba
Merge staging-next into staging 2021-06-27 00:10:43 +00:00
Doron Behar
aedc67d64f
Merge pull request #63899 from pasqui23/kconnect 2021-06-26 21:00:34 +00:00
Sandro
5faf13ddad
Merge pull request #119657 from syncom/syncom/deterministic-efiimg 2021-06-26 21:50:20 +02:00
Elis Hirwing
94d07b7492
php: Run nixpkgs-fmt on all php related files 2021-06-26 20:07:56 +02:00
github-actions[bot]
8f71a7f335
Merge staging-next into staging 2021-06-26 18:04:40 +00:00
Jörg Thalheim
1e125a8002
Merge pull request #122674 from wakira/pam-order 
nixos/pam: prioritize safer auth methods over fingerprints
 2021-06-26 16:52:25 +02:00
Jörg Thalheim
07cd950ab1
nixos/system76: fix evaluation 2021-06-26 15:16:59 +02:00
github-actions[bot]
de0cfc5563
Merge staging-next into staging 2021-06-26 12:06:28 +00:00
github-actions[bot]
45003ba5f9
Merge master into staging-next 2021-06-26 12:06:25 +00:00
*Kim Zick
fbbaa4d40f
nixos/zsh: change default prompt theme to 'suse' 
This resolves a long-standing issue caused by the 'walters' theme setting `RPS1`.  See #38535 for discussion details.
 2021-06-26 06:36:51 -04:00
Martin Weinelt
ef2ce48d8b
Merge pull request #127767 from Mic92/go-neb 2021-06-26 12:23:16 +02:00
Jörg Thalheim
34d1c55580
nixos/go-neb: secret support 2021-06-26 11:59:50 +02:00
Robert Schütz
cbdb097629 Merge branch 'master' into staging-next 2021-06-26 10:53:04 +02:00
Robert Hensing
c1a75084ea
Merge pull request #127744 from cransom/disk-image-faster 
make-disk-image: Reduce forking
 2021-06-26 08:31:12 +02:00
github-actions[bot]
947012b992
Merge staging-next into staging 2021-06-26 00:09:11 +00:00
github-actions[bot]
f15360e6a4
Merge master into staging-next 2021-06-26 00:09:07 +00:00
Niklas Hambüchen
f254bdb473
Merge pull request #128150 from scvalex/etcd-passthru-test 
etcd: refactor the service to add etcd to systemPackages instead of the etcdctl alias
 2021-06-26 01:50:42 +02:00
Alexandru Scvortov
e08b3f0c85 etcd: fix old aliased package name to make tests pass 2021-06-25 23:45:12 +01:00
Robert Schütz
d6234c2165 Merge branch 'master' into staging-next 2021-06-26 00:33:58 +02:00
Florian Klink
6845a74d4c
Merge pull request #128082 from flokli/sdcard-firmware-partition-offset 
nixos/sdcard: make firmware partition offset configurable
 2021-06-25 22:52:07 +02:00
Florian Klink
1db54a5522 nixos/sdcard: make firmware partition offset configurable 
Different boards using u-boot SPL require to write to different
locations. Sometimes, the 8MiB gap isn't sufficient - rk3399 boards
write to 0x16384 for example, which is at 8MiB, thus overriding the
fat32 partition with the SPL.
 2021-06-25 22:33:42 +02:00
Florian Klink
9de5cbca45
Merge pull request #128079 from flokli/serial-getty-keep-baud 
nixos/getty: add missing --keep-baud
 2021-06-25 22:31:02 +02:00
Sandro
54cccb99de
Merge pull request #127941 from liff/libwnck/3-is-default 2021-06-25 15:53:01 +02:00
github-actions[bot]
be086cc67b
Merge staging-next into staging 2021-06-25 12:06:08 +00:00
github-actions[bot]
bae6b2055f
Merge master into staging-next 2021-06-25 12:06:04 +00:00
Michael Weiss
370a10c27f
Merge pull request #128055 from Synthetica9/sway-check-quit 
nixos/tests/sway: add check that sway quits
 2021-06-25 13:23:39 +02:00
Maximilian Bosch
eb5013d20d
Merge pull request #128048 from dali99/add-txredisapi-synapse 
Add txredisapi to matrix-synapse dependencies
 2021-06-25 10:40:11 +02:00
Florian Klink
7e0623fb25
Merge pull request #127824 from yu-re-ka/feature/gitlab-14-0-0 
gitlab: 13.12.4 -> 14.0.1
 2021-06-25 10:30:09 +02:00
Robert Schütz
c1dca92daf Merge branch 'master' into staging-next 2021-06-25 10:02:10 +02:00
Florian Klink
ba42d639f1 nixos/getty: add missing --keep-baud 
systemd ships `units/serial-getty@.service.m4` with the `--keep-baud`
option.

We override that unit, and didn't add the `--keep-baud` option. (We have
it in our other getty options there).

Having `--keep-baud` in `serial-getty@` makes a lot of sense - the
console keeps working if it's initialized with a less standard baud
rate, such as the [Helios64](https://wiki.kobol.io/helios64/intro/).
 2021-06-25 09:56:54 +02:00
Niklas Hambüchen
c223fd6007 release notes: Mention consul breaking changes 2021-06-24 20:58:59 -07:00
Jan Tojnar
27bbb94761
Merge pull request #127085 from minijackson/xdg-desktop-portal-wlr-0.4.0-and-module 
xdg-desktop-portal-wlr: 0.3.0 -> 0.4.0 and module
 2021-06-25 03:50:44 +02:00
Niklas Hambüchen
3b392e8951
Merge pull request #128057 from nh2/nixos-manual-xkb-layouts-fixes 
manual: Fix missing semicolon in custom keyboard layout example
 2021-06-25 02:39:08 +02:00
Niklas Hambüchen
a3c29c2cee manual: Fix missing semicolon in custom keyboard layout example 2021-06-25 02:23:55 +02:00
Patrick Hilhorst
ad1141b528
nixos/tests/sway: add check that sway quits 
We used to check that sway quits _succesfully_.
However, since 73d7f08b4d
disabled this, we'll add another check to see it quits _at all_.

cc @primeos
 2021-06-25 02:06:00 +02:00
Yureka
2297eb35e5 nixos/gitlab: require at least postgresql 12 2021-06-25 01:21:19 +02:00
Daniel Olsen
f7f52a4fbf pythonPackages.txredisapi: Add unit test 2021-06-24 23:34:03 +02:00
Michael Weiss
73d7f08b4d
sway: 1.6 -> 1.6.1 
Since wlroots 0.14 setting WLR_RENDERER_ALLOW_SOFTWARE=1 to allow
software rendering is now enforced [0].

[0]: https://github.com/swaywm/wlroots/pull/2810
 2021-06-24 22:59:06 +02:00
talyz
9af3672f4f
discourse: Fix plugin support 
For plugins to work properly, their assets need to be precompiled
along with the rest of Discourse's assets. This means we need to build
new packages when the list of plugins change.
 2021-06-24 19:38:19 +02:00
Max
2cf6f9e5bd
nixos/systemd-boot: Use os.path.realpath to fully resolve symlinks 
os.readlink only resolves one layer of symlinks. This script explicitly relies on the real path of a file for deduplication, hence symlink resolution should recurse.
 2021-06-24 17:52:03 +02:00
Olli Helenius
8609f3fd20
libwnck: make 3.36.0 default 2021-06-24 18:04:30 +03:00
Yurii Matsiuk
21dd07a0ca
appgate-sdp: minimize and improve derivation 2021-06-24 11:22:54 +02:00
github-actions[bot]
1f528e6ac6
Merge staging-next into staging 2021-06-24 00:06:31 +00:00
github-actions[bot]
d437a6cac2
Merge master into staging-next 2021-06-24 00:06:27 +00:00
Martin Weinelt
9cc60287dc
Merge pull request #127554 from mweinelt/babel 
nixos/babeld: update hardening
 2021-06-23 21:53:20 +02:00
github-actions[bot]
bcc720d9c5
Merge staging-next into staging 2021-06-23 18:04:33 +00:00
github-actions[bot]
b68a0d2f5e
Merge master into staging-next 2021-06-23 18:04:30 +00:00
Ryan Mulligan
f91d7910ea doc: cleanup documentation relating to release notes 
Also delete empty release notes file.
 2021-06-23 11:04:22 -07:00
Ryan Mulligan
920113a6e5
Merge pull request #127734 from blaggacao/da/convert-rel-notes-md-2105 
nixos/doc: convert 21.05 release notes to CommonMark
 2021-06-23 10:48:24 -07:00
David Arnold
32c2dd304d
docs: nixos release notes to CommonMark (2105) 
docs: nixos release notes (revise code blocks)

docs: nixos release notes (fix opt links outside of code blocks)

docs: nixos release notes (fix opt links inside of code blocks)

went fishing with:

```console
rg -A1 \
   --multiline \
   --multiline-dotall \
   '<programlisting>[^</programlisting>]+' \
| rg linkend
```

docs: nixos release notes (prettier)

docs: nixos release notes (restore admonition from prettier destriction)

docs: nixos release notes (recreate xml files)

docs: nixos release notes (fix code block indentation)

docs: nixos release notes (diff after converting with https://github.com/NixOS/nixpkgs/pull/127270)
 2021-06-23 12:33:16 -05:00
Michael Weiss
eb8a694d92
nixos/sway: Drop rxvt-unicode from the extraPackages default 
Upstream switched to Alacritty for the default configuration.
 2021-06-23 17:35:20 +02:00
github-actions[bot]
14f789f9e5
Merge staging-next into staging 2021-06-23 12:04:29 +00:00
github-actions[bot]
b59d049598
Merge master into staging-next 2021-06-23 12:04:25 +00:00
Sandro
1956a52857
Merge pull request #126656 from jwoudenberg/add-system76-power 2021-06-23 12:54:22 +02:00
github-actions[bot]
64eb8c173d
Merge staging-next into staging 2021-06-23 00:09:37 +00:00
github-actions[bot]
e8122c3628
Merge master into staging-next 2021-06-23 00:09:33 +00:00
Niklas Hambüchen
959c4e82bc
Merge pull request #100255 from nh2/sshd-default-log-level-info 
sshd service: Default to INFO logLevel (upstream default)
 2021-06-23 02:06:54 +02:00
Niklas Hambüchen
4bd5f1115f
Merge pull request #127166 from nh2/xserver-config-mkAfter-docs 
services.xorg.config: Extend docs
 2021-06-23 01:55:58 +02:00
Niklas Hambüchen
a48fea4c5e sshd service: Default to INFO logLevel (upstream default). 
The previous justification for using "VERBOSE" is incorrect,
because OpenSSH does use level INFO to log "which key was used
to log in" for sccessful logins, see:
6247812c76/auth.c (L323-L328)

Also update description to the wording of the sshd_config man page.

`fail2ban` needs, sshd to be "VERBOSE" to work well, thus
the `fail2ban` module sets it to "VERBOSE" if enabled.

The docs are updated accordingly.
 2021-06-23 01:49:11 +02:00
Niklas Hambüchen
e85693afde
Merge pull request #127157 from nh2/xserver-readable-config-indentation 
xserver: Generate readable config indentation
 2021-06-23 01:16:50 +02:00
Martin Weinelt
b607aadaac
Merge branch 'master' into staging-next 2021-06-22 23:55:21 +02:00
Ryan Mulligan
160831a5a8
Merge pull request #127783 from rnhmjoj/sshfs-doc 
nixos/doc: add section on sshfs file systems
 2021-06-22 12:13:56 -07:00
rnhmjoj
21a5268b26 nixos/doc: add section on sshfs file systems 
This documents how to use sshfs a bit and how to set up an automatically
mounted sshfs filesystem in NixOS. Also it closes #125905.
 2021-06-22 11:58:25 -07:00
Sandro
bb8c2116dd
Merge pull request #127599 from Ma27/bump-privacyidea 2021-06-22 18:26:45 +02:00
Ryan Mulligan
5fa785a60a
Merge pull request #127134 from blaggacao/da/convert-rel-notes-md 
doc: convert rel notes to CommonMark
 2021-06-22 08:15:26 -07:00
David Arnold
1f6969dd5e
docs: nixos release notes (w/o 2105 - separate PR) 
docs: nixos release notes (revise code blocks)

docs: nixos release notes (fix opt links outside of code blocks)

docs: nixos release notes (fix opt links inside of code blocks)

went fishing with:

```console
rg -A1 \
   --multiline \
   --multiline-dotall \
   '<programlisting>[^</programlisting>]+' \
| rg linkend
```

docs: nixos release notes (prettier)

docs: nixos release notes (fix zonefile codeblocks)

docs: nixos release notes (restore admonition from prettier destriction)

docs: nixos release notes (recreate xml files)

docs: nixos release notes (fix trnslation error md -> xml)

admonition with a title seem not to work

docs: nixos release notes (fix code block indentation)

docs: nixos release notes (diff after converting with https://github.com/NixOS/nixpkgs/pull/127270)

docs: nixos release notes (fix remaingin '???')

Those where not catched i a previous iteration since they didn't satisfy
the then presumed search regex `#opt-.*`

doc: nixos release notes make docbook/md conversion consistent
 2021-06-22 09:52:13 -05:00
Maximilian Bosch
5aad4e73b6
privacyIDEA: 3.5.2 -> 3.6 
ChangeLog: https://github.com/privacyidea/privacyidea/releases/tag/v3.6

Unfortunately we have to use `sqlalchemy` at 1.3 for `sqlsoup`. As
`sqlalchemy` is required by a lot of packages, I decided to move this
package out of `pythonPackages` itself and instantiate a new
`pythonPackages` inside the expression where `sqlalchemy` points to
`sqlalchemy_1_3`.
 2021-06-22 15:36:36 +02:00
github-actions[bot]
b766664645
Merge staging-next into staging 2021-06-22 12:05:04 +00:00
github-actions[bot]
c7bb5a79c8
Merge master into staging-next 2021-06-22 12:05:00 +00:00
Jacek Galowicz
243f958b40
Merge pull request #127763 from Mic92/test-driver-shell 
nixos/test-driver: replace termlib with socat
 2021-06-22 10:32:18 +02:00
Sandro
5f44b42bf4
Merge pull request #127641 from xfix/promethus-state-permissions 2021-06-22 10:23:56 +02:00
Jörg Thalheim
48aec70ea1
nixos/test-driver: replace termlib with socat 
telnetlib does not handle unicode, which is annoying when using systemctl.
Also this gives us a nice readline with history.
 2021-06-22 09:08:57 +02:00
Linus Heckemann
203e81e4ee
Merge pull request #125281 from zhaofengli/phosh-systemd 
phosh: 0.10.2 -> 0.11.0
 2021-06-22 08:23:29 +02:00
Casey Ransom
c3f28aed94 make-disk-image: Reduce forking 
The disk image calculator was using find + exec forking du for every
file in the disk image, making it very slow. Change du to accept files,
nul delimeted on stdin to speed it back up.

Before change:
nix-build nixos/tests/image-contents.nix  9.71s user 1.06s system 8% cpu 2:13.11 total

After change:
nix-build nixos/tests/image-contents.nix  9.93s user 1.23s system 21% cpu 51.601 total
 2021-06-21 22:58:07 -04:00
github-actions[bot]
1df79d27a7
Merge staging-next into staging 2021-06-22 00:07:12 +00:00
Martin Weinelt
eef9694ebc
Merge branch 'master' into staging-next 2021-06-22 00:58:31 +02:00
Robert Hensing
59bbfdf324
Merge pull request #127628 from blaggacao/da/fix-constant-nixos-revision 
nixosTest: Force system.nixos.revision constant
 2021-06-21 20:26:30 +02:00
David Arnold
8bbdff4581
nixosTest: Force system.nixos.revision constant 
nixos tests are blended with other system configurations, hence
their settings must be either enforced or defaulted.

This particular setting is set via lib.nixosSystem as
`system.nixos.revision = final.mkIf (self ? rev) self.rev;` which would
mean that without this change no flake generated nixos could be blended
with nixos testing.

This setting was made previously constant in 
169c6b4b14 in order to avoid pointless
rebuilds of the testing VMs, but was set without enforcing it.
 2021-06-21 11:08:26 -05:00
Konrad Borowski
447b1cf03d nixos/prometheus: allow state access for service only 
There is no reason for Prometheus state files to be
world-readable.
 2021-06-21 10:16:47 +02:00
Bjørn Forsman
64c70a8c4c doc: point out that nixos-21.05 has gnuradio 3.9 
Reading the release notes I got the impression that the latest (and
default) was GR3.8, but it is in fact 3.9. Make that more obvioius.
 2021-06-21 09:33:22 +02:00
Jörg Thalheim
7c2d15627a
Merge pull request #92378 from jnetod/zfs-smb-share-fix 
zfs: patch client path used in smb share
 2021-06-21 07:11:43 +02:00
Sandro
0c72a4ffaf
Merge pull request #127545 from liff/antlr/v4-is-default 
antlr: make 4.8 default
 2021-06-20 23:22:35 +02:00
Bjørn Forsman
7afaacf9a8 doc: fix link to kodi-19.0 announcement 2021-06-20 19:54:08 +02:00
Sandro
84a79c2f0f
Merge pull request #126284 from aanderse/zabbix-user-params 
zabbixAgent: add bash to $PATH
 2021-06-20 17:58:43 +02:00
Sandro
e6a012fb00
Merge pull request #127063 from talyz/fail2ban-restart 
nixos/fail2ban: Remove `reloadIfChanged = true`
 2021-06-20 17:57:57 +02:00
github-actions[bot]
cca41fbbb9
Merge staging-next into staging 2021-06-20 12:04:41 +00:00
github-actions[bot]
9c8cef37d2
Merge master into staging-next 2021-06-20 12:04:37 +00:00
Martin Weinelt
8739f8cd7b
nixos/babeld: update hardening 2021-06-20 13:52:49 +02:00
Olli Helenius
b2bf2c6102
antlr: make 4.8 default 2021-06-20 14:06:47 +03:00
illustris
85aa4bf92b nixos/jitsi-meet: update nixos tests 
- remove check for `connected .JID: focus@auth.server` because
	- log format was changed in c1945ea6cb
	- connection.getUser() in jicofo also appears to be broken, returning null instead of username
	- testing for this log line shouldn't be necessary, as we also test for "Authenticated as focus@auth.server"

- remove check for `External component successfully authenticated` because
	- [JVB no longer uses component](https://community.jitsi.org/t/jvb-not-connecting/91157/2)

- increase VM memory
 2021-06-20 12:36:51 +02:00
illustris
e0089c38ca nixos/jitsi-meet: include jitsi prosody plugins in prosody extraPluginPaths 2021-06-20 12:36:51 +02:00
illustris
34b9ba2e61 nixos/jitsi-meet: Update jitsi prosody configs 
Changes made as per b6f7f8fba7
 2021-06-20 12:36:51 +02:00
Minijackson
ab15091abe
nixos/manual: mention xdg.portal.wlr module in Wayland 2021-06-20 11:53:45 +02:00
Minijackson
f4dd218c7c
nixos/xdg/portal/wlr: init 2021-06-20 11:53:45 +02:00
github-actions[bot]
222489e4be
Merge staging-next into staging 2021-06-19 00:08:40 +00:00
github-actions[bot]
d0cc21f4bd
Merge master into staging-next 2021-06-19 00:08:37 +00:00
Jörg Thalheim
a4cb90bdbd
Update nixos/tests/zfs.nix 
Co-authored-by: jnetod <49963580+jnetod@users.noreply.github.com>
 2021-06-18 22:19:16 +02:00
Sandro
4c960dfc28
Merge pull request #127370 from nagy/port-types 2021-06-18 20:20:26 +02:00
Martin Weinelt
af664bf942
Merge pull request #127127 from mweinelt/home-assistant 
nixos/home-assistant: update hardening
 2021-06-18 20:15:05 +02:00
github-actions[bot]
4ea74538ce
Merge master into staging-next 2021-06-18 18:04:25 +00:00
Daniel Nagy
e08f7a3bb8
nixos/infinoted: use port type 2021-06-18 17:32:03 +02:00
Daniel Nagy
5940259a21
nixos/mwlib: use port type 2021-06-18 17:31:44 +02:00
Daniel Nagy
34b4df8993
nixos/subsonic: use port type 2021-06-18 17:30:56 +02:00
Daniel Nagy
06962df4d2
nixos/murmur: use port type 2021-06-18 17:30:33 +02:00
Daniel Nagy
50ba0ac3d6
nixos/dockerRegistry: use port type 2021-06-18 17:30:11 +02:00
Daniel Nagy
a8808784e5
nixos/leaps: use port type 2021-06-18 17:29:44 +02:00
Daniel Nagy
50af10e205
nixos/gpsd: use port type 2021-06-18 17:29:24 +02:00
Daniel Nagy
864dabf232
nixos/paperless: use port type 2021-06-18 17:29:15 +02:00
Daniel Nagy
bc87386ac1
nixos/redmine: use port type 2021-06-18 17:29:05 +02:00
Daniel Nagy
7d1363d0cb
nixos/nar-serve: use port type 2021-06-18 17:28:54 +02:00
Daniel Nagy
73896b0634
nixos/nix-serve: use port type 2021-06-18 17:28:35 +02:00
Daniel Nagy
4161c37628
nixos/ttyd: use port type 2021-06-18 17:28:17 +02:00
Daniel Nagy
d566bd2ddc
nixos/namecoind: use port type 2021-06-18 17:27:42 +02:00
Daniel Nagy
044d996906
nixos/grafana: use port type 2021-06-18 17:27:31 +02:00
Daniel Nagy
c726455687
nixos/octoprint: use port type 2021-06-18 17:27:16 +02:00
Daniel Nagy
ab5d317d51
nixos/gitea: use port type 2021-06-18 17:27:06 +02:00
Daniel Nagy
4037c974f5
nixos/mysql: use port type 2021-06-18 17:26:55 +02:00
Daniel Nagy
d65f16bc02
nixos/rabbitmq: use port type 2021-06-18 17:26:27 +02:00
Kim Lindberger
410496d0f3
Merge pull request #127309 from jakobrs/nixos-normalise-null 
Resolve evaluation failure when filesystem device option is null
 2021-06-18 17:15:08 +02:00
adisbladis
1394a33858
Merge pull request #125598 from zowoq/podman 
podman: 3.1.2 -> 3.2.1
 2021-06-18 09:59:48 -05:00
aszlig
bc0997489b
nixos/test-driver: Fix passing passthru attribute 
Apparently this looks like it was forgotten when doing commit
3884ff70ba, which refactored the test
runner and driver a bit.

The passthru argument actually was correctly reintroduced in
setupDriverForTest, but the actual makeTest function didn't use it.

This fixes the nixpkgs tarball job, which previously failed with:

  attribute 'elkPackages' missing, at /build/source/pkgs/tools/misc/logstash/6.x.nix:58:30

Signed-off-by: aszlig <aszlig@nix.build>
Acked-by: David Arnold <dar@xoe.solutions>
Fixes: https://github.com/NixOS/nixpkgs/issues/127274
Merges: https://github.com/NixOS/nixpkgs/pull/127346
 2021-06-18 14:50:15 +02:00
github-actions[bot]
dd892e7e2f
Merge master into staging-next 2021-06-18 12:04:55 +00:00
jakobrs
7a0c1728ac nixos/lib: Handle null device correctly 2021-06-18 08:32:45 +02:00
zowoq
9edf2e0ffd nixos/podman/tests: add workaround for broken import 2021-06-18 15:43:24 +10:00
Jan Tojnar
f07dcbef64
nixos/doc: Synchronize the Markdown generator with Nixpkgs 
Switch to CommonMark with our extensions.
 2021-06-18 00:07:00 +02:00
Niklas Hambüchen
65d3180336 services.xorg.config: Extend docs 2021-06-17 04:08:21 +02:00
Niklas Hambüchen
685e8ff7dd xserver: Generate readable config indentation 2021-06-17 03:34:40 +02:00
Martin Weinelt
36659d1efa
nixos/home-assistant: update hardening 
This makes access to serial devices contingent on using certain
components and restricts the default setup even further.
 2021-06-16 21:31:24 +02:00
github-actions[bot]
8b9fa8d446
Merge staging-next into staging 2021-06-16 18:04:48 +00:00
Jan Tojnar
e3dfa79441
Merge branch 'staging-next' into staging 
Regenerated pkgs/servers/x11/xorg/default.nix to resolve the conflict.
 2021-06-16 19:59:05 +02:00
Jacek Galowicz
a6d8488c58
Merge pull request #125973 from blaggacao/nixos-test-ref/02-normalise-test-driver-nix-expressions 
nixos test ref/02 normalise test driver nix expressions
 2021-06-16 18:59:23 +02:00
Sandro
22a29f491a
Merge pull request #124566 from mweinelt/synapse-jemalloc 2021-06-16 17:52:56 +02:00
talyz
b4c069b147
nixos/fail2ban: Remove reloadIfChanged = true 
This makes the service fail when upgrading the package, so let's
properly restart it instead.
 2021-06-16 13:52:46 +02:00
Erik Skytthe
d1b4158155
nixos/grafana: Change services.grafana.provision.datasources.*.type to be open (#126831) 2021-06-16 11:12:51 +02:00
markuskowa
5ad54b5bc9
Merge pull request #126785 from oxzi/ucarp-1.5.2 
ucarp: init at 1.5.2 / nixos/ucarp: init / nixos/test/ucarp: init
 2021-06-16 10:54:23 +02:00
aszlig
6db890aff7
Merge pull request #127025 (fix overlayfs test) 
This essentially fixes the overlayfs test, which was broken since a
while but since commit b7749c7671 was
pushed to master the error has actually surfaced.

The reason why I'm merging this immediately without additional review is
because the change is fixing something that's currently broken so the
worst that could happen is that things are still broken.

However, since I did open a pull request, the checks done by @ofborg at
least seem to suggest that this is indeed fixing the test.
 2021-06-16 04:38:34 +02:00
aszlig
c55e00d8ff
nixos/tests/overlayfs: Use individual commands 
This reverts the test to be similar to its original Perl version, where
the test steps were performed as individual commands instead of what we
have now, where commands are sent to the machine as one giant string.

While this change doesn't seem like it would make a big difference, it
makes a huge difference if the test fails because you then get an error
about which command has failed exactly instead of just knowing that
"something in there" has failed.

I also switched 2 spaces indentation, because it is more in line with
Nix coding conventions.

Signed-off-by: aszlig <aszlig@nix.build>
 2021-06-16 04:12:18 +02:00
aszlig
9ecde9d165
nixos/tests/overlayfs: Fix erroneous backslashes 
Since commit b7749c7671, commands run as
part of VM tests are exiting immediately if an error happens.

When converting the overlayfs test to Python in commit
5ae92144ba, the individual test commands
were crammed into one big string instead of using a series of test
commands like done in the Perl version.

Additionally, the backslash-escaped dollar signs were necessary in
Perl's double-quoted strings to avoid variable interpolation, for Python
however, this results in an actual backslash being inserted into the
command.

While this obviously results in an exit code of 1 (without an error
message, since it's using bash's expression evaluation command), the
test didn't fail because putting all these commands in one string will
result in only the last error code being relevant.

With the change to "set -e" for commands sent to test machines, this has
changed and with the exit code of all commands now relevant, the test
now fails because the errors from individual command substitutions that
were prevented by escaping the dollar sign are now actually visible.

This in turn also means that until now, we wouldn't have noticed if the
overlayfs test would have failed for real.

Signed-off-by: aszlig <aszlig@nix.build>
 2021-06-16 04:12:04 +02:00