Skip to content

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

Merged
cole-h merged 1 commit intoNixOS:masterfrom
helsinki-systems:top-level
Feb 4, 2021
Merged

nixos/top-level: add specialisation.<name>.configuration type#111456
cole-h merged 1 commit intoNixOS:masterfrom
helsinki-systems:top-level

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.

@ofborg ofborg bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 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: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jan 31, 2021
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.

@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

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 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: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants