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.

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

Support extendModules for injecting nixos-shell's options and config modules #58

Merged
merged 3 commits into from
May 2, 2023

Conversation

tomeon
Copy link
Contributor

@tomeon tomeon commented Jun 26, 2022

This changeset makes it possible for folks on a recent-enough nixpkgs to use nixos-shell without declaring their system configs with lib.makeOverridable. Basically, this nixos-generators PR, except:

  1. This PR does not remove support for nixpkgs prior to the commit that introduced extendModules, and
  2. This PR also adds code to issue a fairly detailed error message in case the caller provides a system config that lacks both the override and extendModules attributes.

Thank you for your consideration.

if `extendModules` is available on the supplied NixOS configuration, in
preference to using `override`.

This permits callers to omit `makeOverridable` when using a
recent-enough nixpkgs.
that describes the issue (inability to mix in nixos-shell's modules) and
links to the README
namely a config that lacks both the `override` and `extendModules`
attributes.
@Radvendii
Copy link
Contributor

Radvendii commented May 2, 2023

This is essential for greatly simplifies my client's workflow, which also uses colmena for deployments. For now I'm just using the PR branch, but it would be nice to get it merged.

@Mic92
Copy link
Owner

Mic92 commented May 2, 2023

Thanks for testing
bors merge

@bors
Copy link

bors bot commented May 2, 2023

Configuration problem:
bors.toml: not found

@Mic92 Mic92 merged commit 2cb7687 into Mic92:master May 2, 2023
@Mic92
Copy link
Owner

Mic92 commented May 2, 2023

https://github.com/Mic92/nixos-shell/releases/tag/1.1.0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants