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.

Sign up for GitHub

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

Jump to bottom

Revert #75031 - caused 2 hydra failures #76881

Closed
wants to merge 7 commits into from
Closed

Revert #75031 - caused 2 hydra failures #76881

wants to merge 7 commits into from

Conversation

grahamc
Copy link
Member

@grahamc grahamc commented Jan 3, 2020

#75031 caused a few hydra failures -- first some IFD due to some path confusion, then due to nixpkgs.tarball failure. Reverting until we can test it a bit more carefully :)

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs 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/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

grahamc added 7 commits January 3, 2020 08:40
@grahamc
Revert "lib/modules: file -> _file for a more idempotent unifyModuleS…
5538b3b 
…yntax"

This reverts commit aa61342.

See NixOS#75031
@grahamc
Revert "lib/modules: Make unifyModuleSyntax fully idempotent"
5980b3d 
This reverts commit 3cc77ce.

See NixOS#75031
@grahamc
Revert "lib/types: Add types.submoduleWith for more flexibility than …
f52bf26 
…types.submodule"

This reverts commit 5002e6a.

See NixOS#75031
@grahamc
Revert "lib/modules: Don't pack submodules specially"
6e62323 
This reverts commit 5414b40.

See NixOS#75031
@grahamc
Revert "nixos/docs: Add docs for types.submoduleWith"
0650d6a 
This reverts commit 90c82bf.

See NixOS#75031
@grahamc
Revert "nixos/syncthing: Fix submodule name usage"
767da96 
This reverts commit bc42515.

See NixOS#75031
@grahamc
Revert "lib/tests: Add submoduleWith tests"
32e2caf 
This reverts commit cc81320.

See NixOS#75031
@grahamc
Copy link
Member Author

grahamc commented Jan 3, 2020

Update: validating this PR through a bisection.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 3, 2020
@grahamc
Copy link
Member Author

grahamc commented Jan 3, 2020

I think I might be mistaken, checking.

@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 Jan 3, 2020
@FRidh
Copy link
Member

FRidh commented Jan 3, 2020 •
edited
Loading

hydra eval was fixed by an earlier revert. Tarball would be fixed by this PR according to ofborg although it still fails for me.

@grahamc
Copy link
Member Author

grahamc commented Jan 3, 2020

Sorry, #75031 wasn't related.

@grahamc grahamc closed this Jan 3, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra Awaiting requested review from edolstra

@infinisil infinisil Awaiting requested review from infinisil

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` 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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@grahamc @FRidh