ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-10-05 12:08:02 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Franz Pletz 2024-07-23 22:04:23 +02:00 committed by GitHub
commit ddc5898ee2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pkgs/os-specific/linux/jool/cli.nix
View File

@ -1,5 +1,12 @@
{ lib, stdenv, fetchFromGitHub, nixosTests {
, autoreconfHook, pkg-config, libnl, iptables lib,
stdenv,
fetchFromGitHub,
nixosTests,
autoreconfHook,
pkg-config,
libnl,
iptables,
}: }:
let let
@ -12,31 +19,40 @@ stdenv.mkDerivation {
src = sourceAttrs.src; src = sourceAttrs.src;
patches = [ patches = [ ./validate-config.patch ];
./validate-config.patch
];
outputs = [ outputs = [
"out" "out"
"man" "man"
]; ];
nativeBuildInputs = [ autoreconfHook pkg-config ]; nativeBuildInputs = [
buildInputs = [ libnl iptables ]; autoreconfHook
pkg-config
];
buildInputs = [
libnl
iptables
];
makeFlags = [ "-C" "src/usr" ]; makeFlags = [
"-C"
"src/usr"
];
prePatch = '' prePatch = ''
sed -e 's%^XTABLES_SO_DIR = .*%XTABLES_SO_DIR = '"$out"'/lib/xtables%g' -i src/usr/iptables/Makefile 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/"; homepage = "https://www.jool.mx/";
description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools"; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - CLI tools";
platforms = platforms.linux; platforms = lib.platforms.linux;
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
maintainers = with maintainers; [ fpletz ]; maintainers = with lib.maintainers; [ fpletz ];
}; };
} }

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

@ -1,4 +1,10 @@
{ lib, stdenv, fetchFromGitHub, kernel, nixosTests }: {
lib,
stdenv,
fetchFromGitHub,
kernel,
nixosTests,
}:
let let
sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; }; sourceAttrs = (import ./source.nix) { inherit fetchFromGitHub; };
@ -23,13 +29,15 @@ stdenv.mkDerivation {
installTargets = "modules_install"; installTargets = "modules_install";
passthru.tests = { inherit (nixosTests) jool; }; passthru.tests = {
inherit (nixosTests) jool;
};
meta = with lib; { meta = {
homepage = "https://www.jool.mx/"; homepage = "https://www.jool.mx/";
description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules"; description = "Fairly compliant SIIT and Stateful NAT64 for Linux - kernel modules";
platforms = platforms.linux; platforms = lib.platforms.linux;
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
maintainers = with maintainers; [ fpletz ]; maintainers = with lib.maintainers; [ fpletz ];
}; };
} }

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

@ -1,11 +1,11 @@
{ fetchFromGitHub }: { fetchFromGitHub }:
rec { rec {
version = "4.1.11"; version = "4.1.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NICMx"; owner = "NICMx";
repo = "Jool"; repo = "Jool";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-fTYUdtU51/zOBbd568QtfUYnqWl+ZN9uSbE29tJC6UM="; hash = "sha256-NJitXmWWEEglg4jag0mRZlmbf5+0sT08/pCssry5zD0=";
}; };
} }