diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-13 06:01:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-13 06:01:45 +0000 |
| commit | 49523dec152f68f48ee65b5612d6b6df035f1ecf (patch) | |
| tree | ffa8eb3b1d6b4bb454dea8ef2a04a078d530bcdb /nixos | |
| parent | 183df628daa5a3cd433490fbb3e6bcafc814ef26 (diff) | |
| parent | 8a68e0b5f5b066adcf26558a383580da64e71456 (diff) | |
| download | nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.gz nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.bz2 nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.lz nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.xz nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.tar.zst nixlib-49523dec152f68f48ee65b5612d6b6df035f1ecf.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2311.section.md | 4 | ||||
| -rw-r--r-- | nixos/modules/services/network-filesystems/kubo.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/x11/xserver.nix | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2311.section.md b/nixos/doc/manual/release-notes/rl-2311.section.md index d6354685d148..e5073f81f202 100644 --- a/nixos/doc/manual/release-notes/rl-2311.section.md +++ b/nixos/doc/manual/release-notes/rl-2311.section.md @@ -100,6 +100,8 @@ - [netclient](https://github.com/gravitl/netclient), an automated WireGuard® Management Client. Available as [services.netclient](#opt-services.netclient.enable). +- [trunk-ng](https://github.com/ctron/trunk), A fork of `trunk`: Build, bundle & ship your Rust WASM application to the web + ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} - `network-online.target` has been fixed to no longer time out for systems with `networking.useDHCP = true` and `networking.useNetworkd = true`. @@ -441,6 +443,8 @@ The module update takes care of the new config syntax and the data itself (user - `python3.pkgs.flitBuildHook` has been removed. Use `flit-core` and `format = "pyproject"` instead. +- The `extend` function of `llvmPackages` has been removed due it coming from the `tools` attrset thus only extending the `tool` attrset. A possible replacement is to construct the set from `libraries` and `tools`, or patch nixpkgs. + - The `qemu-vm.nix` module now supports disabling overriding `fileSystems` with `virtualisation.fileSystems`. This enables the user to boot VMs from "external" disk images not created by the qemu-vm module. You can stop the diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 5a355f3441d8..bc746bed31f2 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -203,10 +203,8 @@ in default = [ "/ip4/0.0.0.0/tcp/4001" "/ip6/::/tcp/4001" - "/ip4/0.0.0.0/udp/4001/quic" "/ip4/0.0.0.0/udp/4001/quic-v1" "/ip4/0.0.0.0/udp/4001/quic-v1/webtransport" - "/ip6/::/udp/4001/quic" "/ip6/::/udp/4001/quic-v1" "/ip6/::/udp/4001/quic-v1/webtransport" ]; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index b2e348a218e9..a5b624fcfdb2 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -365,6 +365,7 @@ in }; xkb = mkOption { + default = { }; description = "X keyboard extension (XKB) configuration"; type = types.submodule { options = { |