lix-project/nixos-module
15
6
Fork 13
Code Issues 3 Pull requests Packages Projects Releases Wiki Activity

fix: check package arguments before applying Nix 2.18 override #34

Merged
jade merged 1 commit from devusb/nixos-module:remove-devenv-overlay into main 2024-09-18 03:40:03 +00:00
Conversation 3 Commits 1 Files changed 1 +6 -6
devusb commented 2024-09-15 16:34:12 +00:00
Contributor
Copy link

As part of a version bump, the nix input for devenv in nixpkgs was changed to nixVersions and the version made explicit. As a consequence, trying to install devenv in a NixOS configuration that also uses this module fails per this upstream issue. This PR resolves the issue by verifying that a package from the override list has nix as an argument before attempting to override that input with upstream Nix 2.18.

As part of a [version bump](https://github.com/NixOS/nixpkgs/pull/341157), the `nix` input for devenv in nixpkgs was changed to `nixVersions` and the version made explicit. As a consequence, trying to install devenv in a NixOS configuration that also uses this module fails per [this upstream issue](https://github.com/cachix/devenv/issues/1444). This PR resolves the issue by verifying that a package from the override list has `nix` as an argument before attempting to override that input with upstream Nix 2.18.
👍 1
devusb added 1 commit 2024-09-15 16:34:16 +00:00
puck commented 2024-09-15 16:36:22 +00:00
Owner
Copy link

This should be conditional on devenv taking nix as argument - it's possible people are still on older nixpkgs versions.

This should be conditional on `devenv` taking `nix` as argument - it's possible people are still on older nixpkgs versions.
devusb force-pushed remove-devenv-overlay from f05ab6682d to 0dda988746 2024-09-15 19:46:29 +00:00 Compare
devusb changed title from fix: remove devenv from override list to fix: check package arguments before applying Nix 2.18 override 2024-09-15 19:46:58 +00:00
devusb commented 2024-09-15 19:47:59 +00:00
Author
Contributor
Copy link

@puck thanks for the feedback -- makes sense. I went ahead and tried to generalize this check for all packages in the override list; hope this looks more reasonable.

@puck thanks for the feedback -- makes sense. I went ahead and tried to generalize this check for all packages in the override list; hope this looks more reasonable.
❤️ 1
jade commented 2024-09-18 03:39:53 +00:00
Owner
Copy link

This looks a lot safer. Thanks!

This looks a lot safer. Thanks!
jade merged commit daeb420858 into main 2024-09-18 03:40:03 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
3 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: lix-project/nixos-module#34
No description provided.
Delete branch "devusb/nixos-module:remove-devenv-overlay"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?