github-actions[bot]
0c2dd9248c
Merge staging-next into staging
2022-01-23 00:02:27 +00:00
github-actions[bot]
429249f120
Merge master into staging-next
2022-01-23 00:01:54 +00:00
Janne Heß
80a29b0d92
Merge pull request #149684 from helsinki-systems/feat/multiple-mariadb-versions
...
mariadb: support multiple versions
2022-01-22 22:24:45 +01:00
Guillaume Girol
4bbd574b2b
Merge pull request #152367 from helsinki-systems/fix/dovecot-ssh_dh
...
nixos/dovecot: make ssl_dh optional
2022-01-22 18:07:16 +00:00
github-actions[bot]
f865a2ca89
Merge staging-next into staging
2022-01-22 18:01:38 +00:00
github-actions[bot]
6922792376
Merge master into staging-next
2022-01-22 18:01:07 +00:00
pennae
06a70d2e08
Merge pull request #153594 from hercules-ci/flake-avoid-copying-nixpkgs-path
...
pkgs.path: Avoid copying when used via flake
2022-01-22 17:14:53 +00:00
Guillaume Girol
cb19ae8afe
Merge pull request #156004 from ju1m/redis
...
nixos/redis: fix port option
2022-01-22 15:51:32 +00:00
Robert Hensing
5d29853c38
nixos/documentation.nix: Use builtins.storePath when appropriate
2022-01-22 16:47:02 +01:00
Robert Hensing
0b222173db
flake.nix: Set nixpkgs.config.path
2022-01-22 16:43:05 +01:00
Robert Hensing
fecf325059
nixos/documentation.nix: Only use store non-flake pkgs.path directly when already copied
2022-01-22 16:42:08 +01:00
Robert Hensing
15a00be189
nixos/documentation: avoid copying nixpkgs subpaths, iteration 2
...
This kind of reverts commit 893ffee286
2022-01-22 16:42:08 +01:00
github-actions[bot]
71b7ebbd7a
Merge staging-next into staging
2022-01-22 06:02:00 +00:00
github-actions[bot]
bc45bc6d10
Merge master into staging-next
2022-01-22 06:01:28 +00:00
ajs124
5833536257
mariadb: mention multiple release support in release notes
2022-01-22 02:28:55 +01:00
ajs124
ef5d714f8c
nixos/tests/mysql-backup: test multiple mariadb versions
2022-01-22 02:27:05 +01:00
ajs124
37ba30c494
nixos/tests/mysql-autobackup: test multiple mariadb versions
2022-01-22 02:27:05 +01:00
ajs124
a2ec554e83
nixos/tests/mysql-replication: test multiple mariadb versions
2022-01-22 02:27:05 +01:00
ajs124
65dfe147b7
nixos/tests/mariadb-galera: test multiple mariadb versions
...
merge both tests and completely refactor
2022-01-22 02:27:04 +01:00
ajs124
38998112c1
nixos/tests/mysql: test multiple mariadb versions
2022-01-22 02:27:04 +01:00
pennae
745802b18e
Merge pull request #156083 from Luflosi/fix-test-networking.networkd.static
...
nixos/networkd: fix networking.networkd.static test
2022-01-22 01:04:48 +00:00
github-actions[bot]
d9c65c9d83
Merge staging-next into staging
2022-01-22 00:02:24 +00:00
github-actions[bot]
1ca0ba653f
Merge master into staging-next
2022-01-22 00:01:46 +00:00
pennae
ce49a1d98c
Merge pull request #155517 from Radvendii/knownHosts
...
programs.ssh.knownHosts.<name>.hostNames -> extraHostNames
2022-01-21 23:24:05 +00:00
Julien Moutinho
32368f32d1
nixos/redis: fix port option
2022-01-21 23:02:20 +01:00
Luflosi
64560de406
nixos/networkd: fix networking.networkd.static test
...
Commit ca58bd0a50https://github.com/NixOS/nixpkgs/pull/144590 for a more context.
2022-01-21 19:35:17 +01:00
github-actions[bot]
f54be409e9
Merge staging-next into staging
2022-01-21 18:02:01 +00:00
github-actions[bot]
fd5336b13e
Merge master into staging-next
2022-01-21 18:01:25 +00:00
Robert Hensing
c4a5efa965
Merge pull request #155522 from Julow/single_line_str
...
types.singleLineStr: strings that don't contain '\n'
2022-01-21 17:39:13 +01:00
Janne Heß
45048dfd0a
Merge pull request #153095 from Madouura/dev/bcachefs-init
...
nixos/stage-1: colon-separated multi-device support
2022-01-21 16:35:10 +01:00
Robert Hensing
2f17ba1d36
Merge pull request #155962 from NixOS/containers-bootloader
...
nixos/container-config: Only use `true` as fallback
2022-01-21 15:13:51 +01:00
github-actions[bot]
d2479e9b4a
Merge staging-next into staging
2022-01-21 12:02:00 +00:00
github-actions[bot]
e156d59d2b
Merge master into staging-next
2022-01-21 12:01:24 +00:00
Lassulus
0defcc063b
Merge pull request #155894 from ivanbrennan/xmonad-tests-remove-sleeps
...
nixosTests.xmonad: avoid sleep()
2022-01-21 11:33:03 +01:00
Maximilian Bosch
588fd794b3
Merge pull request #155502 from yayayayaka/nextcloud-optional-headers
...
nixos/nextcloud: Optionally disable setting HTTP response headers
2022-01-21 10:53:28 +01:00
github-actions[bot]
233e4a0c95
Merge staging-next into staging
2022-01-21 00:03:13 +00:00
github-actions[bot]
fc3ddb8979
Merge master into staging-next
2022-01-21 00:01:42 +00:00
Michele Guerini Rocco
3e5848ef15
Merge pull request #144590 from Luflosi/networkd-routes
...
nixos/networkd: Add routes from interfaces to [Route] section of .network file
2022-01-21 00:33:50 +01:00
Naïm Favier
1147d72481
nixos: use uniq in the type of system.build
...
`unspecified` will happily concatenate strings together from two
unrelated modules, causing spurious errors (see #155925 ).
2022-01-20 23:28:09 +01:00
Jan Tojnar
b1f7021657
nixos/container-config: Only use true as fallback
...
LXC containers like those used by VPSAdminOS might want to install a bootloader
so passing `true` to `system.build.installBootLoader` without any priority specified,
causes a conflict for such systems with the recent `system.build` changes:
4014fb6a64https://github.com/NixOS/nixpkgs/issues/155839
2022-01-20 23:10:13 +01:00
pennae
2ed91b7349
Merge pull request #155854 from datafoo/networkd-IPMasquerade-assert
...
nixos/networking: fix assertion on IPMasquerade
2022-01-20 20:56:55 +00:00
Jan Tojnar
5ac7a55c73
Merge pull request #155862 from ncfavier/revert-150980-gdm-test
...
nixosTests.gnome: Revert "add autologin delay to catch GDM failures"
2022-01-20 21:38:21 +01:00
Alyssa Ross
b1724b2f81
nixos/activation-script: ensure gcroots dir exists
...
If the Nix daemon has never been enabled (nix.enable has always been
set to false), the gcroots directory won't exist. If the Nix daemon
is later enabled, the GC roots for booted-system and current-system
will be missing, and they might end up being garbage collected. Since
it's cheap to add GC roots even if the daemon will never be enabled,
let's just always add them so we're okay in the case where the daemon
is enabled later.
2022-01-20 20:24:32 +00:00
pennae
530b033563
Merge pull request #155928 from ncfavier/borgbackup-literalDocBook
...
nixos/borgbackup: remove literalDocBook in description
2022-01-20 19:57:26 +00:00
Luflosi
ca58bd0a50
nixos/networkd: Add routes from interfaces to [Route] section of .network file
...
Closes https://github.com/NixOS/nixpkgs/pull/93635 .
2022-01-20 20:14:55 +01:00
Maximilian Bosch
fde7c9d409
Merge pull request #155499 from bachp/gitea-dump-file
...
nixos/gitea: allow specifying dump format and name
2022-01-20 20:11:51 +01:00
Naïm Favier
6565458f9d
nixos/borgbackup: remove literalDocBook in description
2022-01-20 20:10:26 +01:00
github-actions[bot]
aeb6db8171
Merge staging-next into staging
2022-01-20 18:01:55 +00:00
github-actions[bot]
ce88a19065
Merge master into staging-next
2022-01-20 18:01:19 +00:00
ivanbrennan
8a1d379992
nixosTests.xmonad: add ivanbrennan to maintainers
2022-01-20 11:17:03 -05:00
