unixtools: refactor for less redundancy #40134
Merged
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
Synthetica9
force-pushed
the
unixtools-refactor
branch
from
b1bad48
to
898e4b0
Compare
matthewbauer
reviewed
May 7, 2018
pkgs/top-level/unix-tools.nix
Outdated
| }; | ||
| logger = { | ||
| linux = pkgs.utillinux; | ||
| darwin = more_compat; |
There was a problem hiding this comment.
This shouldn't be included.
There was a problem hiding this comment.
Yeah, right you are, it was an accidental paste and I mistook it for an accidental deletion
Synthetica9
force-pushed
the
unixtools-refactor
branch
from
898e4b0
to
4b93f21
Compare
matthewbauer
approved these changes
May 7, 2018
pkgs/top-level/unix-tools.nix
Outdated
| darwin = pkgs.darwin.basic_cmds; | ||
|
|
||
| makeCompat = name': value: buildEnv { | ||
| name = name' + "-compat"; |
There was a problem hiding this comment.
Make sure these have 2 space indentation.
|
(Looks like master machine broke, probably shouldn't merge this until that is fixed, just to make sure it won't trigger a mass rebuild) |
|
The eval error was hopefully unrelated. @GrahamcOfBorg eval |
8 tasks
|
Looks like its fine now |
|
Thanks! |
|
Unfortunately this complicates merging with staging, which made changes to unix-tools before the reformatting. Can someone take a look? Thanks! |
|
Just merged master into staging. |
|
@matthewbauer haha thanks! 😸 |
|
Wew, that was quick 😅 |
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.
Motivation for this change
unix-toolsdidn't quite follow the DRY principle, refactored it to follow this principle better.This shouldn't actually change the output of any derivation, just the way we get there, so @GrahamcOfBorg shouldn't give any rebuilds.
Things done
build-use-sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)