Unverified Commit e62a56d4 authored by Nico Felbinger's avatar Nico Felbinger
Browse files

ifstate: 2.1.0 -> 2.2.0

parent 7fd9583d

nixos/modules/services/networking/ifstate.nix

+1 −8
Original line number Diff line number Diff line
@@ -123,9 +123,8 @@ in 
        type = lib.types.package;

        default = cfg.package.override {

          withConfigValidation = false;

          withWireguard = false;

        };

        defaultText = lib.literalExpression "pkgs.ifstate.override { withConfigValidation = false; withWireguard = false; }";

        defaultText = lib.literalExpression "pkgs.ifstate.override { withConfigValidation = false; }";

        description = "The initrd IfState package to use.";

      };
@@ -195,12 +194,6 @@ in 
    })

    (lib.mkIf initrdCfg.enable {

      assertions = [

        {

          assertion =

            initrdCfg.package.passthru.features.withWireguard

            || !(builtins.elem "wireguard" initrdInterfaceTypes);

          message = "IfState initrd package is configured without the `wireguard` feature, but wireguard interfaces are configured. Please see the `boot.initrd.network.ifstate.package` option.";

        }

        {

          assertion = initrdCfg.allowIfstateToDrasticlyIncreaseInitrdSize;

          message = "IfState in initrd drastically increases the size of initrd, your boot partition may be too small and/or you may have significantly fewer generations. By setting boot.initrd.network.initrd.allowIfstateToDrasticlyIncreaseInitrdSize to true, you acknowledge this fact and keep it in mind when reporting issues.";

pkgs/by-name/if/ifstate/package.nix

+3 −6
Original line number Diff line number Diff line
@@ -10,17 +10,16 @@ 
  withBpf ? false,

  withConfigValidation ? true,

  withShellColor ? false,

  withWireguard ? true,

}:



let

  version = "2.1.0";

  version = "2.2.0";

  src = fetchFromGitea {

    domain = "codeberg.org";

    owner = "liske";

    repo = "ifstate";

    tag = version;

    hash = "sha256-HgbaLKlWU9YL279/WKLMLC/vxwmnDhBZFdELMRyJl0Y=";

    hash = "sha256-Q06lGGGQxJ7ntgXRzfnsJN+A/08AIOsOkz3cg2xZGr4=";

  };

  docs = stdenv.mkDerivation {

    pname = "ifstate-docs";
@@ -80,8 +79,7 @@ let 
        setproctitle

      ]

      ++ lib.optional withConfigValidation jsonschema

      ++ lib.optional withShellColor pygments

      ++ lib.optional withWireguard wgnlpy;

      ++ lib.optional withShellColor pygments;



    pythonRemoveDeps = lib.optional (!withConfigValidation) "jsonschema";
@@ -100,7 +98,6 @@ let 
          withBpf

          withConfigValidation

          withShellColor

          withWireguard

          ;

      };

      # needed for access in schema validaten in module