nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Backport release-26.05] jool: 4.1.14 -> 4.1.15 (#555324)

Browse Source
This commit is contained in:
Franz Pletz
2026-08-22 08:09:58 +00:00
committed by GitHub
parent 9f2a64d74f dcb25ce403
commit 6e8f89dec8
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
nixos/tests/jool.nix
View File

@@ -71,6 +71,7 @@ in
];
};
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.jool.enable = true;
networking.jool.siit.default.global.pool6 = "fd::/96";
};
@@ -191,6 +192,7 @@ in
];
};
boot.kernelPackages = pkgs.linuxPackages_latest;
networking.jool.enable = true;
networking.jool.nat64.default = {
bib = [
@@ -206,17 +208,17 @@ in
{
protocol = "TCP";
prefix = "203.0.113.1/32";
"port range" = "40001-65535";
"port range" = "20000-29999";
}
{
protocol = "UDP";
prefix = "203.0.113.1/32";
"port range" = "40001-65535";
"port range" = "20000-29999";
}
{
protocol = "ICMP";
prefix = "203.0.113.1/32";
"port range" = "40001-65535";
"port range" = "20000-29999";
}
# Ports for static BIB entries
{

7
pkgs/os-specific/linux/jool/default.nix
View File

@@ -19,10 +19,11 @@ stdenv.mkDerivation (finalAttrs: {
src = sourceAttrs.src;
patches = lib.optionals (lib.versionAtLeast kernel.version "6.18.0") [
patches = lib.optionals (lib.versionAtLeast kernel.version "7.2") [
# https://github.com/NICMx/Jool/pull/456
(fetchpatch {
url = "https://gitlab.alpinelinux.org/alpine/aports/-/raw/3.23-stable/community/jool-modules-lts/kernel-6.18.patch";
hash = "sha256-EtV95YaOzPU3e/8NQvUtAH/RWiV16djeKrnvSgYybCQ=";
url = "https://github.com/NICMx/Jool/commit/47a8c7426f08e50505e69eef7ff607a04fbab52e.diff";
hash = "sha256-EcfBwFKOSFQOBWl8s5Pa2/RJg9lH1ziGzvV4ap2505M=";
})
];

4
pkgs/os-specific/linux/jool/source.nix
View File

@@ -1,11 +1,11 @@
{ fetchFromGitHub }:
rec {
version = "4.1.14";
version = "4.1.15";
src = fetchFromGitHub {
owner = "NICMx";
repo = "Jool";
tag = "v${version}";
hash = "sha256-fAs289FFdUnddkikm4ceA9d/w1qqqaWuPXmAiq3cIA8=";
hash = "sha256-I+cgxOONq8LZWlpVaqXW+MmEKts/dQAr7Hs8uC6N8/w=";
};
}