Unverified Commit 271d1175 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

treewide: fix eval related to `with lib;` removal (#339356)

parents bf757cef f6306c09

nixos/modules/config/i18n.nix

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
        };

        defaultText = lib.literalExpression ''

          pkgs.glibcLocales.override {

            allLocales = any (x: x == "all") config.i18n.supportedLocales;

            allLocales = lib.any (x: x == "all") config.i18n.supportedLocales;

            locales = config.i18n.supportedLocales;

          }

        '';

nixos/modules/config/resolvconf.nix

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ in 
    (lib.mkRenamedOptionModule [ "networking" "dnsExtensionMechanism" ] [ "networking" "resolvconf" "dnsExtensionMechanism" ])

    (lib.mkRenamedOptionModule [ "networking" "extraResolvconfConf" ] [ "networking" "resolvconf" "extraConfig" ])

    (lib.mkRenamedOptionModule [ "networking" "resolvconfOptions" ] [ "networking" "resolvconf" "extraOptions" ])

    (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for lib.anything lib.anyways")

    (lib.mkRemovedOptionModule [ "networking" "resolvconf" "useHostResolvConf" ] "This option was never used for anything anyways")

  ];



  options = {

nixos/modules/services/continuous-integration/jenkins/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -205,13 +205,13 @@ in { 
      preStart =

        let replacePlugins =

              lib.optionalString (cfg.plugins != null) (

                let pluginCmds = lib.attrsets.lib.mapAttrsToList

                let pluginCmds = lib.mapAttrsToList

                      (n: v: "cp ${v} ${cfg.home}/plugins/${n}.jpi")

                      cfg.plugins;

                in ''

                  rm -r ${cfg.home}/plugins || true

                  mkdir -p ${cfg.home}/plugins

                  ${lib.strings.lib.concatStringsSep "\n" pluginCmds}

                  ${lib.concatStringsSep "\n" pluginCmds}

                '');

        in ''

          rm -rf ${cfg.home}/war