curlHTTP3: drop

This commit is contained in:
Marie Ramlow
2025-08-22 17:21:53 +02:00
parent 95eb787aa5
commit a7b73a106a
10 changed files with 14 additions and 20 deletions

View File

@@ -68,7 +68,7 @@
client = client =
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = [ pkgs.curlHTTP3 ]; environment.systemPackages = [ pkgs.curl ];
}; };
}; };
testScript = '' testScript = ''

View File

@@ -66,7 +66,7 @@ builtins.listToAttrs (
client = client =
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = [ pkgs.curlHTTP3 ]; environment.systemPackages = [ pkgs.curl ];
networking = { networking = {
interfaces.eth1 = { interfaces.eth1 = {
ipv4.addresses = [ ipv4.addresses = [

View File

@@ -64,7 +64,7 @@ in
client = client =
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = [ pkgs.curlHTTP3 ]; environment.systemPackages = [ pkgs.curl ];
networking = { networking = {
interfaces.eth1 = { interfaces.eth1 = {
ipv4.addresses = [ ipv4.addresses = [

View File

@@ -249,7 +249,7 @@ in
]; ];
environment.systemPackages = [ environment.systemPackages = [
pkgs.curlHTTP3 pkgs.curl
pkgs.iproute2 pkgs.iproute2
]; ];
@@ -308,7 +308,7 @@ in
]; ];
environment.systemPackages = [ environment.systemPackages = [
pkgs.curlHTTP3 pkgs.curl
pkgs.iproute2 pkgs.iproute2
]; ];
@@ -369,7 +369,7 @@ in
(builtins.readFile ./common/acme/server/ca.cert.pem) (builtins.readFile ./common/acme/server/ca.cert.pem)
]; ];
environment.systemPackages = [ pkgs.curlHTTP3 ]; environment.systemPackages = [ pkgs.curl ];
systemd.services.sing-box.serviceConfig.ExecStartPost = [ systemd.services.sing-box.serviceConfig.ExecStartPost = [
"+${tproxyPost}/bin/exe" "+${tproxyPost}/bin/exe"

View File

@@ -44,7 +44,7 @@ in
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = [ environment.systemPackages = [
pkgs.curlHTTP3 pkgs.curl
]; ];
services.h2o = { services.h2o = {

View File

@@ -5,13 +5,10 @@
cmake, cmake,
gtest, gtest,
c-ares, c-ares,
curlHTTP3, curl,
libev, libev,
}: }:
let
curl' = curlHTTP3;
in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "https-dns-proxy"; pname = "https-dns-proxy";
# there are no stable releases (yet?) # there are no stable releases (yet?)
@@ -38,7 +35,7 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
c-ares c-ares
curl' curl
libev libev
]; ];

View File

@@ -3,7 +3,7 @@
stdenv, stdenv,
fetchurl, fetchurl,
cmake, cmake,
curlHTTP3, curl,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true; doCheck = true;
passthru.tests = { passthru.tests = {
inherit curlHTTP3; inherit curl;
}; };
meta = { meta = {

View File

@@ -9,7 +9,7 @@
openssl, openssl,
withJemalloc ? false, withJemalloc ? false,
jemalloc, jemalloc,
curlHTTP3, curl,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
doCheck = true; doCheck = true;
passthru.tests = { passthru.tests = {
inherit curlHTTP3; inherit curl;
}; };
meta = { meta = {

View File

@@ -694,6 +694,7 @@ mapAliases {
cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08 cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12 cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
curlHTTP3 = lib.warnOnInstantiate "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27 cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27
cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17 cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09 cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09

View File

@@ -2643,10 +2643,6 @@ with pkgs;
websocketSupport = true; websocketSupport = true;
}; };
curlHTTP3 = curl.override {
http3Support = true;
};
curl = curlMinimal.override ( curl = curlMinimal.override (
{ {
idnSupport = true; idnSupport = true;