Merge pull request NixOS#328959 from fpletz/pkgs/jool-4.1.12

thenonameguy · Jul 23, 2024 · ddc5898 · ddc5898
2 parents 13d3588 + de3c22d
commit ddc5898
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 21 deletions.
diff --git a/pkgs/os-specific/linux/jool/cli.nix b/pkgs/os-specific/linux/jool/cli.nix
@@ -1,5 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, nixosTests
-, autoreconfHook, pkg-config, libnl, iptables
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nixosTests,
+  autoreconfHook,
+  pkg-config,
+  libnl,
+  iptables,
 }:
 
 let
@@ -12,31 +19,40 @@ stdenv.mkDerivation {
 
   src = sourceAttrs.src;
 
-  patches = [
-    ./validate-config.patch
-  ];
+  patches = [ ./validate-config.patch ];
 
   outputs = [
     "out"
     "man"
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkg-config ];
-  buildInputs = [ libnl iptables ];
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+  buildInputs = [
+    libnl
+    iptables
+  ];
 
-  makeFlags = [ "-C" "src/usr" ];
+  makeFlags = [
+    "-C"
+    "src/usr"
+  ];
 
   prePatch = ''
     sed -e 's%^XTABLES_SO_DIR = .*%XTABLES_SO_DIR = '"$out"'/lib/xtables%g' -i src/usr/iptables/Makefile
   '';
 
-  passthru.tests = { inherit (nixosTests) jool; };
+  passthru.tests = {
+    inherit (nixosTests) jool;
+  };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.jool.mx/";
     description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools";
-    platforms = platforms.linux;
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fpletz ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fpletz ];
   };
 }
diff --git a/pkgs/os-specific/linux/jool/default.nix b/pkgs/os-specific/linux/jool/default.nix
@@ -1,4 +1,10 @@
-{ lib, stdenv, fetchFromGitHub, kernel, nixosTests }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  kernel,
+  nixosTests,
+}:
 
 let
   sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
@@ -23,13 +29,15 @@ stdenv.mkDerivation {
 
   installTargets = "modules_install";
 
-  passthru.tests = { inherit (nixosTests) jool; };
+  passthru.tests = {
+    inherit (nixosTests) jool;
+  };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.jool.mx/";
     description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules";
-    platforms = platforms.linux;
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ fpletz ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fpletz ];
   };
 }
diff --git a/pkgs/os-specific/linux/jool/source.nix b/pkgs/os-specific/linux/jool/source.nix
@@ -1,11 +1,11 @@
 { fetchFromGitHub }:
 
 rec {
-  version = "4.1.11";
+  version = "4.1.12";
   src = fetchFromGitHub {
     owner = "NICMx";
     repo = "Jool";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fTYUdtU51/zOBbd568QtfUYnqWl+ZN9uSbE29tJC6UM=";
+    hash = "sha256-NJitXmWWEEglg4jag0mRZlmbf5+0sT08/pCssry5zD0=";
   };
 }