1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-26 02:56:36 +03:00
Commit graph

9729 commits

Author SHA1 Message Date
github-actions[bot]
a0cb562430
Merge staging-next into staging 2024-10-11 12:06:07 +00:00
github-actions[bot]
ca2d394166
Merge master into staging-next 2024-10-11 12:05:38 +00:00
Sandro
eac17593c1
croc: 10.0.11 -> 10.0.13 (#338918) 2024-10-11 11:38:18 +02:00
Felix Uhl
73011ba96f nixos/systemd-boot: add windows option for easy dual-booting
When installing NixOS on a machine with Windows, the "easiest" solution
to dual-boot is re-using the existing EFI System Partition (ESP), which
allows systemd-boot to detect Windows automatically.

However, if there are multiple ESPs, maybe even on multiple disks,
systemd-boot is unable to detect the other OSes, and you either have to
use Grub and os-prober, or do a tedious manual configuration as
described in the wiki:
https://wiki.nixos.org/w/index.php?title=Dual_Booting_NixOS_and_Windows&redirect=no#EFI_with_multiple_disks

This commit automates and documents this properly so only a single line
like

    boot.loader.systemd-boot.windows."10".efiDeviceHandle = "HD0c2";

is required.

In the future, we might want to try automatically detecting this
during installation, but finding the correct device handle while the
kernel is running is tricky.
2024-10-11 10:56:02 +02:00
Felix Uhl
f2e5b04c4e nixos/systemd-boot: add edk2-uefi-shell boot option
We already have a edk2-uefi-shell package in nixpkgs, but adding it to
systemd-boot was somewhat tedious. Now it's a single line of nix.
2024-10-11 10:53:42 +02:00
Felix Uhl
548206583d nixos/systemd-boot: autoformat 2024-10-11 10:53:38 +02:00
OPNA2608
1b660ba22a tests/lomiri: Test keymap switch, make keymap OCR more consistent 2024-10-11 05:18:44 +02:00
OPNA2608
6037708c33 lomiri.lomiri-content-hub: Rename from lomiri.content-hub, 1.1.1 -> 2.0.0 2024-10-11 05:17:29 +02:00
github-actions[bot]
61a438a474
Merge staging-next into staging 2024-10-10 12:06:10 +00:00
github-actions[bot]
a5883bc172
Merge master into staging-next 2024-10-10 12:05:39 +00:00
Franz Pletz
1479e0c4de
nixos/frr: refactor (#327099) 2024-10-10 12:55:34 +02:00
Pol Dellaiera
a72a8bcfb3
treewide: fix typo chown -> chmod (#347678) 2024-10-10 10:55:34 +02:00
r-vdp
30a99334c3
nixos/tmate-ssh-server: Fix typo, chown -> chmod 2024-10-10 09:03:55 +02:00
r-vdp
89abe3c610
nixos/nebula: Fix typo, chown -> chmod 2024-10-10 09:03:29 +02:00
Frank Doepper
ecdfb14ef9 nixos/frr: refactor
- use upstream service and scripts
- switch to integrated-vtysh-config, abandon per-daemon config
- use always daemon names in options (e.g. ospf -> ospfd)
- zebra, mgmtd and staticd are always enabled
- abandon vtyListenAddress, vtyListenPort options; use
  just "extraOptions" or "options" instead, respectively
- extend test to test staticd
- update release-notes
- pkgs.servers.frr: fix sbindir and remove FHS PATH
- introduce services.frr.openFilesLimit option
2024-10-09 22:49:50 +02:00
Sandro Jäckel
cb097d74cc
nixos/tests/croc: fix --pass argument and code passing 2024-10-09 17:40:39 +02:00
Sandro Jäckel
fc264c25c2
croc: remove inactive maintainer; nixos/tests/croc: match maintainer with package 2024-10-09 17:39:40 +02:00
github-actions[bot]
7bcc9dd470
Merge staging-next into staging 2024-10-09 12:07:41 +00:00
github-actions[bot]
0b14a71873
Merge master into staging-next 2024-10-09 12:06:03 +00:00
Florian Klink
c2a2f68c8c nixosTests.openresty-lua: simplify
There's no point for the intermediate `getPath` function calling
`getLuaPath` with the "lua" argument.
There's also no other nginx test this copies code from.

We always call `getLuaPath` with "lua", so constant-propagate it in.

Also, camel-case `lualibs` to `luaLibs.`
2024-10-09 14:12:14 +03:00
github-actions[bot]
a0b1d0baed
Merge staging-next into staging 2024-10-07 12:06:11 +00:00
github-actions[bot]
b33aedbb4d
Merge master into staging-next 2024-10-07 12:05:43 +00:00
Sandro
41dd374aa4
nixosTests: fixup tests/common/resolver to work with a local resolver (#346793) 2024-10-07 10:35:03 +02:00
Cosima Neidahl
a825406b15
lomiri.lomiri: Replace NIXOS_XKB_LAYOUTS envvar with file (#345288) 2024-10-07 09:33:40 +02:00
github-actions[bot]
6c9d940294
Merge staging-next into staging 2024-10-07 06:05:43 +00:00
github-actions[bot]
5fa43e7396
Merge master into staging-next 2024-10-07 06:05:15 +00:00
James Atkins
68483a7bad nixos/networkd: test systemd-creds in WireGuard 2024-10-06 22:27:21 -05:00
Emily
1a53b400e5
mongodb: mongodb-5_0 -> mongodb-7_0; mongodb-5_0: drop; unifi: unifi7 -> unifi8; unifi{7,-video}: drop (#345625) 2024-10-07 01:38:54 +01:00
Emily
086676017e mongodb: mongodb-5_0 -> mongodb-7_0 2024-10-06 22:47:42 +01:00
Emily
b0395df085 unifi7: drop 2024-10-06 22:47:41 +01:00
K900
84fce7e588 Merge remote-tracking branch 'origin/staging-next' into staging 2024-10-06 21:11:05 +03:00
github-actions[bot]
7ab01e096c
Merge master into staging-next 2024-10-06 18:03:58 +00:00
Michele Guerini Rocco
7eef63ed98
wpa_supplicant: add patch to fix ext_passwords_file bug (#342792) 2024-10-06 19:15:19 +02:00
Michele Guerini Rocco
463f8b8ed4
nixos/tests/dnsdist: fix dnscrypt test (#346843) 2024-10-06 19:12:07 +02:00
Arthur Gautier
a32dbada18 nixosTests: fixup tests/common/resolver to work with a local resolver
When 757a455dde refactored the zones to go
from a list to a map, this broke the tests/common/resolver helper.

reproduction:
```
let
  pkgs = import <nixpkgs> {};

  testConfig = {
    name = "resolver-repro";
    nodes = {
      acme = { nodes, ... }: {
        imports = [ (pkgs.path + /nixos/tests/common/acme/server) ];
      };
    };

    testScript = ''
    '';
  };
in pkgs.nixosTest testConfig
```
2024-10-06 15:18:45 +00:00
Sandro
0cc879fa99
nixos/tests/non-default-filesystems: fix btrfs mount regex (#340702) 2024-10-06 14:08:21 +02:00
Sandro
85100fcc51
nixos/tests/tmate-ssh-server: fix test (#342318) 2024-10-06 14:07:14 +02:00
Sandro
020c26717f
nixos/quorum: fix geth args, fix test (#341181) 2024-10-06 14:06:31 +02:00
Sandro
c0ad8503fa
nixos/tests/pgjwt: fix test (#341150) 2024-10-06 14:05:36 +02:00
rnhmjoj
cf614ee789
nixos/tests/dnsdist: fix dnscrypt test 2024-10-06 11:34:57 +02:00
github-actions[bot]
bbea34947c
Merge staging-next into staging 2024-10-06 06:05:02 +00:00
github-actions[bot]
7dc1e4239b
Merge master into staging-next 2024-10-06 06:04:33 +00:00
Peder Bergebakken Sundt
90c1e58d22
zammad: 6.2.0 -> 6.3.1 (#345456) 2024-10-06 03:00:44 +02:00
github-actions[bot]
480db5cf27
Merge staging-next into staging 2024-10-06 00:15:59 +00:00
github-actions[bot]
ff851b037d
Merge master into staging-next 2024-10-06 00:15:37 +00:00
Nick Cao
5f821de20c
keycloak: 25.0.6 -> 26.0.0 (#346439) 2024-10-05 18:14:45 -04:00
Jared Baur
c2621cb78a
nixosTests.nix-upgrade: fix failing test
The test currently fails because we attempt to switch to a NixOS
configuration that is _very_ different from the one we are switching
from (e.g. the new configuration has an entirely empty /etc/fstab,
causing switch-to-configuration to want to start unmounting all
filesystems defined in the old configuration).
2024-10-05 09:51:28 -07:00
Nick Cao
937d3964c9
nixos/keycloak: raise memory size in tests to 2047M 2024-10-04 21:43:19 -04:00
Nick Cao
05caac302f
nixos/keycloak: fixup login test after ui change 2024-10-04 20:39:55 -04:00
github-actions[bot]
32379e1a0b
Merge staging-next into staging 2024-10-05 00:14:22 +00:00