jool: reformat (de3c22d3) · Commits · nix / nixpkgs

pkgs/os-specific/linux/jool/cli.nix

+29 −13

Original line number	Diff line number	Diff line
		{ 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 ];
		};
		}

+14 −6

Original line number	Diff line number	Diff line
		{ 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 ];
		};
		}