jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
297,639 Commits 266 Branches 122 Tags 5.3 GiB
b766664645
Commit Graph

22115 Commits

Author SHA1 Message Date
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
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 
169c6b4b1478a3a0c823c99ea39d4082f76a2708 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
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
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
3884ff70badca0c93c717e6190946a9a2846e948, 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