github-actions[bot]
0fa08dae1b
Merge master into staging-next
2021-06-30 00:08:50 +00:00
Sandro
defb64fd5b
Merge pull request #128461 from kittywitch/fvwm-gestures-fix
...
nixos/fvwm: gestures -> enableGestures as of #118256
2021-06-30 02:07:12 +02:00
Sandro
3a0d1ab3e2
Merge pull request #128546 from scvalex/fix-kubernetes-tests
...
kubernetes: make tests pass by fixing a conntrack-tools dep and a missing dir
2021-06-30 01:49:58 +02:00
Timothy DeHerrera
7e59c19715
nixos-option: remove if nix.package
is unstable
...
This was done in a0a61c3e34
, but users
typically install `nixUnstable` via `nix.package`, not by overlaying
`pkgs.nix` directly.
2021-06-29 16:13:52 -07:00
github-actions[bot]
943ac1310d
Merge master into staging-next
2021-06-29 18:04:10 +00:00
Linus Heckemann
34d960aecb
Merge pull request #124486 from xaverdh/linux-patch-once
...
nixos/boot: properly override the kernel in boot.kernelPatches
2021-06-29 19:01:46 +02:00
github-actions[bot]
dcfd9788a1
Merge master into staging-next
2021-06-29 00:10:52 +00:00
Luke Granger-Brown
0dccbe2729
nixos/tests/kernel-generic: fix evaluation
...
This is breaking the tarball build, because #128502 depends on this test
existing. After this commit, nixpkgs.tarball once again evaluates.
2021-06-28 22:41:56 +00:00
Alexandru Scvortov
ab1567e812
kubernetes: fix conntrack-tools package name, missing dir, and tests
2021-06-28 20:33:17 +01:00
github-actions[bot]
3a3d290719
Merge master into staging-next
2021-06-28 18:12:01 +00:00
Maciej Krüger
3029af3051
Merge pull request #128522 from j0hax/patch-1
2021-06-28 18:18:31 +02:00
Johannes Arnold
3a30f52676
nixos/nginx: fix typo
2021-06-28 18:08:31 +02:00
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
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
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