Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

trivial: treewide: random noop cleanups #46076

Merged
merged 4 commits into from Sep 5, 2018
Merged

Conversation

oxij
Copy link
Member

@oxij oxij commented Sep 5, 2018

Motivation for this change

OCD.

Things done
  • Nothing changes.

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: stdenv

Partial log (click to expand)

/nix/store/pjq5v1xgljr4ygb1h1xfybdjydczcqiw-stdenv-linux

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: stdenv

Partial log (click to expand)

/nix/store/i6vl5lwlz5jbkg4r6p340dwmj6fha3xq-stdenv-linux

@oxij
Copy link
Member Author

oxij commented Sep 5, 2018

@Ericson2314 So, do you want me to change something here?

@Ericson2314
Copy link
Member

Yes actually. See 54282b9 my TODO exists because it should go back to being just a simple inherit. I only made it weird in order to avoid a mass rebuild; I thought I had done the cleanup but I guess I had not.

@Ericson2314
Copy link
Member

Actually no the nix parameter cannot be removed, but the environment variable can. Anyways, just drop those TODO removes from this, and I'll clean up GHC separately.

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: stdenv

Partial log (click to expand)

/nix/store/i6vl5lwlz5jbkg4r6p340dwmj6fha3xq-stdenv-linux

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: stdenv

Partial log (click to expand)

/nix/store/pjq5v1xgljr4ygb1h1xfybdjydczcqiw-stdenv-linux

@@ -16022,7 +16022,7 @@ with pkgs;
ImageCaptureCore GSS ImageIO;
};

emacsPackagesGen = emacs: self: let callPackage = newScope self; in rec {
emacsPackagesFor = emacs: self: let callPackage = newScope self; in rec {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need an alias.nix entry? Not sure whether this was intended to be user-exposed.

@oxij
Copy link
Member Author

oxij commented Sep 5, 2018 via email

@oxij
Copy link
Member Author

oxij commented Sep 5, 2018 via email

@Ericson2314
Copy link
Member

OK all makes sense. Looks good.

@Ericson2314 Ericson2314 merged commit 32df890 into NixOS:master Sep 5, 2018
@oxij oxij deleted the tree/cleanups branch November 18, 2018 08:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants