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

specialization: fix name conflict inside NixOS module #3718

Merged
merged 1 commit into from
Feb 28, 2023
Merged

specialization: fix name conflict inside NixOS module #3718

merged 1 commit into from
Feb 28, 2023

Conversation

ncfavier
Copy link
Member

@ncfavier ncfavier commented Feb 28, 2023 •
edited
Loading

If used inside the NixOS/nix-darwin module, we get conflicting definitions of name inside the specialization: one is the user name coming from the NixOS module definition and the other is configuration, the name of this option. Thus we need to explicitly wire the former into the module arguments.

Fixes #3716

Checklist

  • Change is backwards compatible.

  • Code formatted with ./format.

  • Code tested through nix-shell --pure tests -A run.all.

  • Test cases updated/added. See example.

  • Commit messages are formatted like

    {component}: {description}

{long description}

    See CONTRIBUTING for more information and recent commit messages for examples.

@ncfavier
specialization: fix name conflict inside NixOS module
b44527a 
If used inside the NixOS/nix-darwin module, we get conflicting definitions
of `name` inside the specialization: one is the user name coming from the
NixOS module definition and the other is `configuration`, the name of this
option. Thus we need to explicitly wire the former into the module arguments.

See discussion at nix-community#3716
@ncfavier ncfavier requested a review from rycee as a code owner February 28, 2023 15:59
@ncfavier ncfavier mentioned this pull request Feb 28, 2023
Closed
2 tasks
roberth
roberth approved these changes Feb 28, 2023
View reviewed changes
Copy link
Contributor

@roberth roberth left a comment

Choose a reason for hiding this comment

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

I'm not a maintainer here, but as the author of extendModules I think this is a good solution.

@ncfavier ncfavier merged commit ddcbf67 into nix-community:master Feb 28, 2023
@ncfavier ncfavier deleted the specialization-name branch February 28, 2023 21:22
SimSaladin added a commit to SimSaladin/home-manager that referenced this pull request Mar 26, 2023
@SimSaladin
Merge remote-tracking branch 'upstream/master' into develop
ab0aff8 
* upstream/master:
  launchd: sync option definition with nix-darwin
  launchd: make Launch Agents config a freeform setting
  home-manager: error out when showing news in flake
  hstr: fix sorting in CODEOWNERS
  hstr: add module
  im/fcitx: drop as fcitx 4 has been removed from nixpkgs (nix-community#3804)
  syncthing: add Darwin support
  zoxide: enable nushell integration
  gpg: fix URL of key in test case
  docs: bump nmd
  programs/alot: make Sent and Drafts folder optional (nix-community#3798)
  zathura: add documentation for mode-specific mappings (nix-community#3797)
  copyq: add module
  listenbrainz-mpd: add module
  mpv: add scriptOpts option, fix tests (nix-community#3491)
  borgmatic: optionally exclude HM symlinks from backup
  borgmatic: change type of extraConfigOption
  docs: reference Stylix in 3rd-party extensions
  home-manager: make generated home.nix more helpful
  Translate using Weblate (Ukrainian)
  Translate using Weblate (Spanish)
  Translate using Weblate (Swedish)
  Update translation files
  home-manager: avoid stray error message
  exa: removed stale comment (nix-community#3789)
  Revert "starship: condition nushell integration on nushell 0.73+" (nix-community#3778)
  .github: bump install-nix-action (nix-community#3723)
  starship: condition nushell integration on nushell 0.73+ (nix-community#3776)
  i3status-rust: update it to handle 0.30.x releases (nix-community#3773)
  home.pointerCursor: set common XCURSOR_* environment variables by default (nix-community#3663)
  home-manager: add `init` command to main tool
  qutebrowser: allow for specifying multiple commands in bindings (nix-community#3322)
  ci: bump DeterminateSystems/update-flake-lock from 16 to 17
  Translate using Weblate (Spanish)
  Translate using Weblate (Swedish)
  atuin: add disable key options (nix-community#3754)
  Update translation files
  Translate using Weblate (Korean)
  home-manager: change default configuration home
  docs: minor typographic improvement in release note
  docs: update description of uninstall command
  vscode: add options for global and user snippets (nix-community#3765)
  Fix path to Kitty theme files (nix-community#3764)
  Translate using Weblate (Japanese)
  Translate using Weblate (Ukrainian)
  Add translation using Weblate (Ukrainian)
  Translate using Weblate (Spanish)
  Translate using Weblate (Swedish)
  Translate using Weblate (Ukrainian)
  Update translation files
  Translate using Weblate (Norwegian Bokmål)
  home-manager: slightly expand option description
  zellij: fix typo
  zellij: switch config lang from yaml to kdl for 0.32.0
  lib: add generator for KDL
  docs: simplify flake-specific instructions in the documentation (nix-community#3737)
  home-manager: handle missing per-user profiles directory
  home-manager: fix nix-env uninstall command
  Translate using Weblate (Japanese)
  flake.lock: Update (nix-community#3654)
  broot: remove unnecessary IFD
  xfconf: fix dbus may not be started in the startup of NixOS. (nix-community#3707)
  mpd: add `extraArgs` (nix-community#3735)
  recoll: fix generation of string lists
  git: allow tags to be unsigned when signing.signByDefault=true (nix-community#3479)
  mako: programs.mako -> services.mako (nix-community#3265)
  docs: add chapter on 3rd-party extensions
  exa: always configure `exa` alias (nix-community#3721)
  specialization: fix `name` conflict inside NixOS module (nix-community#3718)
  .github: pin nix 2.13 in workflows (nix-community#3720)
  `exa`: add more options (nix-community#3505)
  aerc: update auth mechanisms (nix-community#3714)
  modules/redshift-gammastep: install package into the profile (nix-community#3710)
  modules/git: make options passed to `less(1)` for `diff-so-fancy` configurable (nix-community#3704)
  Set the SHELL environment variable for keychain in .xsession (nix-community#3695)
  home-manager: make `--version` report 23.05-pre
  flake: avoid recursive set
  docs: slight improvement of Flake documentation
  programs.gpg: update references to respective manpages (nix-community#3648)
  starship: Use mkEnableOption (nix-community#3701)
  avizo: add module
  firefox: fix search options without a default engine
  launchd: fix example of StartCalendarInterval
  mpd-mpris: add module
  qt: auto-detect style package from name (nix-community#3692)
  direnv: nushell integration should not be read only
  ci: bump cachix/install-nix-action from 18 to 19
  Translate using Weblate (Portuguese)
  Add translation using Weblate (Portuguese)
  Translate using Weblate (Portuguese)
  owncloud-client: add package option
  prezto: add missing use of yesNo
  tests: fix gnupg stub (nix-community#3685)
  keychain: add nushell integration
15cm pushed a commit to 15cm/home-manager that referenced this pull request Apr 22, 2023
@ncfavier @15cm
specialization: fix name conflict inside NixOS module (nix-communit…
43344a2 
…y#3718)

If used inside the NixOS/nix-darwin module, we get conflicting definitions
of `name` inside the specialization: one is the user name coming from the
NixOS module definition and the other is `configuration`, the name of this
option. Thus we need to explicitly wire the former into the module arguments.

See discussion at nix-community#3716
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@roberth roberth roberth approved these changes

@rycee rycee Awaiting requested review from rycee

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

bug: Specialization does not work with nixos modules
2 participants
@ncfavier @roberth