Skip to content

mkshell: small fix for #137005#137105

Merged
zimbatm merged 1 commit intoNixOS:masterfrom
greedy:patch-2
Sep 8, 2021
Merged

mkshell: small fix for #137005#137105
zimbatm merged 1 commit intoNixOS:masterfrom
greedy:patch-2

Conversation

@greedy
Copy link
Contributor

@greedy greedy commented Sep 8, 2021

Motivation for this change

I somehow accidentally left out the lib.flatten from mergeInputs. Without it, subtractLists won't ever remove anything from the inputs since the inputs will be a list of lists.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.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.

I somehow accidentally left out the lib.flatten from mergeInputs. Without it, subtractLists won't ever remove anything from the inputs since the inputs will be a list of lists.
@greedy
Copy link
Contributor Author

greedy commented Sep 8, 2021

Sorry @zimbatm I somehow made the last pull request without the flatten call and only noticed the mistake this morning.

@SuperSandro2000
Copy link
Member

@ofborg eval

@zimbatm
Copy link
Member

zimbatm commented Sep 8, 2021

my bad, I should have tested the change

@zimbatm zimbatm merged commit c524608 into NixOS:master Sep 8, 2021
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Sep 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants