treewide/nixos: remove with lib; part 9
#361257
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
6.topic: nixos
github-actions
bot
added
10.rebuild-darwin: 0
gepbird
added
the
2.status: merge conflict
gepbird
suggested changes
Dec 26, 2024
Stunkymonkey
force-pushed
the
treewide-nixos-remove-with-lib-9
branch
from
de42f45 to
ffcb2f0
Compare
Stunkymonkey
removed
the
2.status: merge conflict
Stunkymonkey
force-pushed
the
treewide-nixos-remove-with-lib-9
branch
from
ffcb2f0 to
27de3e3
Compare
Stunkymonkey
commented
Dec 29, 2024
| listenAddresses = mkOption { | ||
| type = with types; coercedTo str singleton (listOf str); | ||
| listenAddresses = lib.mkOption { | ||
| type = with lib.types; coercedTo str lib.singleton (listOf str); |
There was a problem hiding this comment.
lib.singleton was added by hand
There was a problem hiding this comment.
singleton was there before, so the only change is adding lib.
Stunkymonkey
commented
Dec 29, 2024
Comment on lines
-11
to
+10
| else generators.mkValueStringDefault {} v; | ||
| else lib.generators.mkValueStringDefault {} v; | ||
| mkKeyValueTinyproxy = { | ||
| mkValueString ? mkValueStringDefault {} | ||
| mkValueString ? lib.generators.mkValueStringDefault {} |
There was a problem hiding this comment.
these lines were manually changed
There was a problem hiding this comment.
Thanks for fixing the eval error
Stunkymonkey
force-pushed
the
treewide-nixos-remove-with-lib-9
branch
from
27de3e3 to
9372db5
Compare
gepbird
approved these changes
Dec 30, 2024
There was a problem hiding this comment.
I looked through all the diff and didn't find any false positives, LGTM!
For double checking I ran a script that filters out the lib (and whitespace) changes, this was the only result:
diff --git a/nixos/modules/services/networking/tinyproxy.nix b/nixos/modules/services/networking/tinyproxy.nix
index 6e07c6a541e9..dd827d7f55f5 100644
--- a/nixos/modules/services/networking/tinyproxy.nix
+++ b/nixos/modules/services/networking/tinyproxy.nix
@@ -1,16 +1,13 @@
- mkValueString ? mkValueStringDefault {}
+ mkValueString ? lib.generators.mkValueStringDefault {}
gepbird
added
the
2.status: merge conflict
|
part of #208242 |
Stunkymonkey
force-pushed
the
treewide-nixos-remove-with-lib-9
branch
from
20aadf8 to
12cb5fe
Compare
Stunkymonkey
removed
the
2.status: merge conflict
gepbird
approved these changes
Dec 30, 2024
wegank
added
the
12.approvals: 1
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
part of #208242
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.