Merge release-24.05 into staging-next-24.05

This commit is contained in:
github-actions[bot]
2024-12-10 00:18:38 +00:00
committed by GitHub
3 changed files with 5 additions and 4 deletions

View File

@@ -237,7 +237,7 @@ let
preStop = ''
state="/run/nixos/network/routes/${i.name}"
if [ -e "$state" ]; then
while read cidr; do
while read -r cidr; do
echo -n "deleting route $cidr... "
ip route del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed"
done < "$state"
@@ -246,7 +246,7 @@ let
state="/run/nixos/network/addresses/${i.name}"
if [ -e "$state" ]; then
while read cidr; do
while read -r cidr; do
echo -n "deleting address $cidr... "
ip addr del "$cidr" dev "${i.name}" >/dev/null 2>&1 && echo "done" || echo "failed"
done < "$state"

View File

@@ -145,6 +145,7 @@ stdenv.mkDerivation rec {
"x86_64-linux"
"aarch64-linux"
];
knownVulnerabilities = [ "CVE-2021-32773" ];
broken = stdenv.isDarwin; # No support yet for setting FFI lookup path
};
}

View File

@@ -18,8 +18,8 @@ let
};
main = {
version = "6.11.10";
hash = "sha256-WNzMM+P8c8Mv+FdrwcEPHwv/ppvgN2fiM+SHMmlAPYw=";
version = "6.11.11";
hash = "sha256-ZBDm6qbzXQhIBVK4EWNI/3WdD7HArwGf5uKCDVBV59c=";
};
};