treewide/nixos: remove with lib; part 4

[Stunkymonkey]

Description of changes

part of #208242

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[philiptaron]

A few things, but overall looking good.

[philiptaron]

whew

[philiptaron]

@Stunkymonkey -- unlike part 3, I did review this.

[Stunkymonkey]

@philiptaron thanks for reviewing. sorry I was ill for a few days.

I still have to improve the commit messages for all commits.

should i split the bigger commits into separate PRs?

[Mic92]

I rebased the pull request since it has been open for quite a while.

[Mic92]

Re-basing found one bug.

[Ma27]

@Mic92 @Stunkymonkey was the same broken script used as in the PRs before?

[Mic92]

I don't know what script was used here.

[caffineehacker]

It looks like the change to nixos/modules/services/networking/cloudflared.nix:276 is wrong. It was changed to lib.filterConfig, but filterConfig is defined on line 268 and is probably what was intended to be used. There are several other changes to lib.filterConfig in that file as well.

Error when evaluating:

</snip>
         at /nix/store/zp7936gnwcnls8vc9das6a9c8307gn74-source/lib/strings.nix:2322:18:

         2321|   */
         2322|   isStringLike = x:
             |                  ^
         2323|     isString x ||

       error: attribute 'filterConfig' missing

       at /nix/store/zp7936gnwcnls8vc9das6a9c8307gn74-source/nixos/modules/services/networking/cloudflared.nix:276:26:

          275|
          276|             fullConfig = lib.filterConfig {
             |                          ^
          277|               tunnel = name;

[Mic92]

I diffed the diff with actual lib functions:

% diff /tmp/func /tmp/actual | grep '-'
--- /tmp/func   2024-09-16 20:55:18.978511697 +0200
+++ /tmp/actual 2024-09-16 20:54:46.727947889 +0200
@@ -1,136 +1,445 @@
-anymore."
-attrsets.filterAttrsRecursive
-attrsets.mapAttrsToList
-cli.toGNUCommandLineShell
-escapeStr
-escapeSystemdPath
-escapeUnitName
-filterConfig
-filterForward
-generators.mkKeyValueDefault
-generators.mkValueStringDefault
-generators.toINI
-generators.toKeyValue
-maintainers.bachp
-maintainers.joachifm
-maintainers.markuskowa
-maintainers.phfroidmont
-modules.mkAliasAndWrapDefsWithPriority
-nixosSystem
-systems`
-systems.elaborate
-systems.equals
-systems.examples.aarch64-multiplatform''
-systems.parsedPlatform
-teams.beam.members
-teams.freedesktop.members
-teams.jitsi.members
-teams.pantheon.members
-types.anything
-types.attrs
-types.attrsOf
-types.bool
-types.commas
-types.either
-types.enum
-types.functionTo
-types.int
-types.ints.between
-types.ints.positive
-types.lines
-types.listOf
-types.nonEmptyListOf
-types.nullOr
-types.oneOf
-types.package
-types.path
-types.path.check
-types.pkgs
-types.port
-types.separatedString
-types.str
-types.submodule
-types.unspecified

[Mic92]

Looks like those are wrong:

-escapeStr
-escapeSystemdPath
-escapeUnitName
-filterConfig
-filterForward

was already fixed.

[Mic92]

Looks like they got and only #342370 is pending.

[Mic92]

This is how I computed the diff to prevent this issue in future:

git diff a15394d51a40315f749ee87728a2e5b6461456f3..b4b8ef5bb6f1d8b31aedf33b0962fd31fc2e09a9 | grep -o -E 'lib\.[^ ;)]+' | sed -e 's/lib\.//' | sort -u > /tmp/func
nix eval --json -f . --apply builtins.attrNames lib | jq -r '.[]' | sort -u > /tmp/actual
diff /tmp/func /tmp/actual | grep '-'