summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-03-06 00:14:33 +0000
committerGitHub <noreply@github.com>2023-03-06 00:14:33 +0000
commitd53b1d31e8cc78d373c2f19f3d7ab949ab48d00e (patch)
tree946162522d3d38676b72f1944f22ed8d499972cb
parentMerge release-22.11 into staging-next-22.11 (diff)
parentMerge pull request #219759 from NixOS/backport-219591-to-release-22.11 (diff)
downloadnixpkgs-d53b1d31e8cc78d373c2f19f3d7ab949ab48d00e.tar.gz
Merge release-22.11 into staging-next-22.11
-rw-r--r--nixos/modules/services/networking/wireguard.nix2
-rw-r--r--nixos/tests/wireguard/namespaces.nix1
-rw-r--r--pkgs/tools/misc/yt-dlp/default.nix4
3 files changed, 4 insertions, 3 deletions
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index e3c3d3ba3c96..631b5f4daf23 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -437,7 +437,7 @@ let
${ipPreMove} link add dev "${name}" type wireguard
${optionalString (values.interfaceNamespace != null && values.interfaceNamespace != values.socketNamespace) ''${ipPreMove} link set "${name}" netns "${ns}"''}
- ${optionalString (values.mtu != null) ''${ipPreMove} link set "${name}" mtu ${toString values.mtu}''}
+ ${optionalString (values.mtu != null) ''${ipPostMove} link set "${name}" mtu ${toString values.mtu}''}
${concatMapStringsSep "\n" (ip:
''${ipPostMove} address add "${ip}" dev "${name}"''
diff --git a/nixos/tests/wireguard/namespaces.nix b/nixos/tests/wireguard/namespaces.nix
index 93dc84a8768e..bf9e188e4a19 100644
--- a/nixos/tests/wireguard/namespaces.nix
+++ b/nixos/tests/wireguard/namespaces.nix
@@ -41,6 +41,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... } : {
preSetup = ''
ip netns add ${interfaceNamespace}
'';
+ mtu = 1280;
inherit interfaceNamespace;
};
};
diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix
index 3442c1987caa..dc0e1e72c4b8 100644
--- a/pkgs/tools/misc/yt-dlp/default.nix
+++ b/pkgs/tools/misc/yt-dlp/default.nix
@@ -20,11 +20,11 @@ buildPythonPackage rec {
# The websites yt-dlp deals with are a very moving target. That means that
# downloads break constantly. Because of that, updates should always be backported
# to the latest stable release.
- version = "2023.3.3";
+ version = "2023.3.4";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-d/017Y9ZtYDP9RYbE9137pklYZpzVTt8A+srCt6nH7c=";
+ sha256 = "sha256-Jl1dqXp2wV19mkCIpnt4rNXc9vjP2CV8UvWB/5lv9RU=";
};
propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ];