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

nixos/top-level: add specialisation.<name>.configuration type #111456

Merged
merged 1 commit into from Feb 4, 2021
Merged

nixos/top-level: add specialisation.<name>.configuration type #111456

merged 1 commit into from Feb 4, 2021

Conversation

Scriptkiddi
Copy link
Contributor

Motivation for this change

#76184

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.

cole-h
cole-h approved these changes Feb 4, 2021
View reviewed changes
Copy link
Member

@cole-h cole-h left a comment

Choose a reason for hiding this comment

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

Diff LGTM, thanks!

@cole-h cole-h merged commit 05fbc82 into NixOS:master Feb 4, 2021
@Scriptkiddi Scriptkiddi deleted the top-level branch February 4, 2021 09:51
@ajs124
Copy link
Member

ajs124 commented Feb 5, 2021

I'm not sure why or how, but with this, the nginx test in nixos/tests fails to evaluate with:

error: The option `services.nginx.virtualHosts.localhost.root' has conflicting definition values:
- In `<unknown-file>': <derivation /nix/store/pbfyh5b86m14f3vkqz7gb8anfiyz2bmc-testdir.drv>
- In `<unknown-file>': <derivation /nix/store/jz45f8nkvqb82iim1s192349c28lbm4b-testdir2.drv>
(use '--show-trace' to show detailed location information)

cc @infinisil as you're the specialisation. guy AFAIR

@ajs124
Copy link
Member

ajs124 commented Feb 5, 2021

Yeah, the acme and specialisation test are also broken with this.

@Scriptkiddi Scriptkiddi mentioned this pull request Feb 5, 2021
Merged
@cole-h
Copy link
Member

cole-h commented Feb 5, 2021

Sorry, I guess I didn't run the related test this time...

I don't actually know how to type this. types.anything works, but I don't know if we want to be more specific.

Ping our resident type-master @infinisil.

@roberth
Copy link
Member

roberth commented Oct 29, 2021

#143207 can make this a proper submodule type.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cole-h cole-h cole-h approved these changes

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 10.rebuild-linux: 1
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@Scriptkiddi @ajs124 @cole-h @roberth