Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions nixos/doc/manual/release-notes/rl-2511.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

- Secure boot support can now be enabled for the Limine bootloader through {option}`boot.loader.limine.secureBoot.enable`. Bootloader install script signs the bootloader, then kernels are hashed during system rebuild and written to a config. This allows Limine to boot only the kernels installed through NixOS system.

- Curl is now built with the HTTP/3 protocol enabled by default.

- The default PostgreSQL version for new NixOS installations (i.e. with `system.stateVersion >= 25.11`) is v17.

- The NetworkManager module does not ship with a default set of VPN plugins anymore. All required VPN plugins must now be explicitly configured in [`networking.networkmanager.plugins`](#opt-networking.networkmanager.plugins).
Expand Down
3 changes: 0 additions & 3 deletions nixos/tests/haproxy.nix
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@
};
client =
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.curlHTTP3 ];
};
};
testScript = ''
# Helpers
Expand Down
1 change: 0 additions & 1 deletion nixos/tests/nginx-http3.nix
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ builtins.listToAttrs (
client =
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.curlHTTP3 ];
networking = {
interfaces.eth1 = {
ipv4.addresses = [
Expand Down
1 change: 0 additions & 1 deletion nixos/tests/rustls-libssl.nix
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ in
client =
{ pkgs, ... }:
{
environment.systemPackages = [ pkgs.curlHTTP3 ];
networking = {
interfaces.eth1 = {
ipv4.addresses = [
Expand Down
4 changes: 0 additions & 4 deletions nixos/tests/sing-box.nix
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,6 @@ in
];

environment.systemPackages = [
pkgs.curlHTTP3
pkgs.iproute2
];

Expand Down Expand Up @@ -308,7 +307,6 @@ in
];

environment.systemPackages = [
pkgs.curlHTTP3
pkgs.iproute2
];

Expand Down Expand Up @@ -369,8 +367,6 @@ in
(builtins.readFile ./common/acme/server/ca.cert.pem)
];

environment.systemPackages = [ pkgs.curlHTTP3 ];

systemd.services.sing-box.serviceConfig.ExecStartPost = [
"+${tproxyPost}/bin/exe"
];
Expand Down
4 changes: 0 additions & 4 deletions nixos/tests/web-servers/h2o/basic.nix
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,6 @@ in
server =
{ pkgs, ... }:
{
environment.systemPackages = [
pkgs.curlHTTP3
];

services.h2o = {
enable = true;
defaultHTTPListenPort = port.HTTP;
Expand Down
7 changes: 2 additions & 5 deletions pkgs/by-name/ht/https-dns-proxy/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,10 @@
cmake,
gtest,
c-ares,
curlHTTP3,
curl,
libev,
}:

let
curl' = curlHTTP3;
in
stdenv.mkDerivation rec {
pname = "https-dns-proxy";
# there are no stable releases (yet?)
Expand All @@ -38,7 +35,7 @@ stdenv.mkDerivation rec {

buildInputs = [
c-ares
curl'
curl
libev
];

Expand Down
18 changes: 5 additions & 13 deletions pkgs/by-name/ng/nghttp3/package.nix
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
cmake,
curlHTTP3,
}:

stdenv.mkDerivation (finalAttrs: {
pname = "nghttp3";
version = "1.11.0";

src = fetchFromGitHub {
owner = "ngtcp2";
repo = "nghttp3";
tag = "v${finalAttrs.version}";
hash = "sha256-8WQfXzzF3K0IJNectrE1amQ6Njq4pZslrcVun6Uhi6E=";
fetchSubmodules = true;
src = fetchurl {
url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2";
hash = "sha256-AAKlyoVtsFmqbcac9zL7sA2aHnPteISPXUjyYh8gyoo=";
};

outputs = [
Expand All @@ -32,13 +28,9 @@ stdenv.mkDerivation (finalAttrs: {

doCheck = true;

passthru.tests = {
inherit curlHTTP3;
};

meta = {
homepage = "https://github.com/ngtcp2/nghttp3";
changelog = "https://github.com/ngtcp2/nghttp3/releases/tag/${finalAttrs.src.tag}";
changelog = "https://github.com/ngtcp2/nghttp3/releases/tag/${finalAttrs.version}";
description = "Implementation of HTTP/3 mapping over QUIC and QPACK in C";
license = lib.licenses.mit;
platforms = lib.platforms.unix;
Expand Down
17 changes: 4 additions & 13 deletions pkgs/development/libraries/ngtcp2/default.nix
Original file line number Diff line number Diff line change
@@ -1,28 +1,23 @@
{
lib,
stdenv,
fetchFromGitHub,
fetchurl,
cmake,
brotli,
libev,
nghttp3,
quictls,
withJemalloc ? false,
jemalloc,
curlHTTP3,
}:

stdenv.mkDerivation (finalAttrs: {
pname = "ngtcp2";
version = "1.14.0";

src = fetchFromGitHub {
owner = "ngtcp2";
repo = "ngtcp2";
# must match version usage in meta.changelog
tag = "v${finalAttrs.version}";
hash = "sha256-5Pmk752i/lgO/os2SegevGN+MKaVuQii2HrVWaR15Gg=";
fetchSubmodules = true;
src = fetchurl {
url = "https://github.com/ngtcp2/ngtcp2/releases/download/v${finalAttrs.version}/ngtcp2-${finalAttrs.version}.tar.bz2";
hash = "sha256-I+Q2UvVwKzGm53S5ON2XtqAyW8UiyUM4R+bG/BYBvrU=";
};

outputs = [
Expand All @@ -46,10 +41,6 @@ stdenv.mkDerivation (finalAttrs: {

doCheck = true;

passthru.tests = {
inherit curlHTTP3;
};

meta = {
homepage = "https://github.com/ngtcp2/ngtcp2";
changelog = "https://github.com/ngtcp2/ngtcp2/releases/tag/v${finalAttrs.version}";
Expand Down
5 changes: 1 addition & 4 deletions pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2661,15 +2661,12 @@ with pkgs;
websocketSupport = true;
};

curlHTTP3 = curl.override {
http3Support = true;
};

curl = curlMinimal.override (
{
idnSupport = true;
pslSupport = true;
zstdSupport = true;
http3Support = true;
}
// lib.optionalAttrs (!stdenv.hostPlatform.isStatic) {
brotliSupport = true;
Expand Down
Loading