Unverified Commit 790aa814 authored by Martin Weinelt's avatar Martin Weinelt Committed by GitHub
Browse files

Merge pull request #298380 from mweinelt/escapeSystemdExecArg-derivation 

nixos/lib: Support derivations in escapeSystemdExecArg
parents f45c6f32 acac5b41

nixos/lib/utils.nix

+2 −2
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ rec { 
    let

      s = if builtins.isPath arg then "${arg}"

        else if builtins.isString arg then arg

        else if builtins.isInt arg || builtins.isFloat arg then toString arg

        else throw "escapeSystemdExecArg only allows strings, paths and numbers";

        else if builtins.isInt arg || builtins.isFloat arg || lib.isDerivation arg then toString arg

        else throw "escapeSystemdExecArg only allows strings, paths, numbers and derivations";

    in

      replaceStrings [ "%" "$" ] [ "%%" "$$" ] (builtins.toJSON s);

pkgs/tools/networking/kea/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -87,7 +87,6 @@ stdenv.mkDerivation rec { 
  passthru.tests = {

    kea = nixosTests.kea;

    prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation;

    prometheus-exporter = nixosTests.prometheus-exporters.kea;

    networking-scripted = lib.recurseIntoAttrs { inherit (nixosTests.networking.scripted) dhcpDefault dhcpSimple dhcpOneIf; };

    networking-networkd = lib.recurseIntoAttrs { inherit (nixosTests.networking.networkd) dhcpDefault dhcpSimple dhcpOneIf; };

  };