lix-project/nixos-module
15
7
Fork 14
Code Issues 4 Pull requests 1 Packages Projects Releases Wiki Activity

callPackage Lix instead of overriding Nixpkgs' Nix #17

Merged
qyriad merged 1 commit from qyriad/nixos-module:call-package into main 2024-04-22 03:57:50 +00:00
Conversation 1 Commits 1 Files changed 1 +10 -24
qyriad commented 2024-04-18 20:58:03 +00:00
Owner
Copy link

This is hopefully more robust, and plays nicer with the soon-to-be switch to Meson

This is hopefully more robust, and plays nicer with the soon-to-be switch to Meson
qyriad added 1 commit 2024-04-18 20:58:08 +00:00
qyriad requested review from jade 2024-04-18 20:58:14 +00:00
lunaphied approved these changes 2024-04-21 03:27:30 +00:00
jade reviewed 2024-04-21 04:14:47 +00:00
overlay.nix
@ -20,0 +22,4 @@
}).overrideAttrs {
# Note: load-bearing version override. Nixpkgs does version detection to determine
# what commands and whatnot we support, so tell Nixpkgs that we're 2.18 (ish).
version = "2.18.3-lix${versionSuffix}";
jade commented 2024-04-21 04:14:47 +00:00
Owner
Copy link

are you sure you don't need VERSION_SUFFIX in here to make the thing actually do the right thing? i think the one here might not have correct nix --version output (in particular, would not have the date) without that.

are you sure you don't need VERSION_SUFFIX in here to make the thing actually do the right thing? i think the one here might not have correct nix --version output (in particular, would not have the date) without that.
lunaphied commented 2024-04-21 04:17:39 +00:00
Owner
Copy link

Sorry I wasn't paying close enough attention, you definitely have to override VERSION_SUFFIX still since it's set by the same thing that we're overriding for version here

Sorry I wasn't paying close enough attention, you definitely have to override `VERSION_SUFFIX` still since it's set by the same thing that we're overriding for `version` here
qyriad commented 2024-04-21 07:17:51 +00:00
Author
Owner
Copy link

VERSION_SUFFIX is set to versionSuffix in Lix:

Line 169 in lix-project/lix@111db8b
VERSION_SUFFIX = versionSuffix;

On our system with this module, this is output of nix --version:

nix (Lix, like Nix) 2.90.0-lixpre20240418-7e79232
`VERSION_SUFFIX` is set to `versionSuffix` in Lix: https://git.lix.systems/lix-project/lix/src/commit/111db8b38fd8350d92d72fa17fd3d9e8ef5a0e09/package.nix#L169 On our system with this module, this is output of `nix --version`: ``` nix (Lix, like Nix) 2.90.0-lixpre20240418-7e79232 ```
jade marked this conversation as resolved
jade approved these changes 2024-04-22 03:15:46 +00:00
jade left a comment
Owner
Copy link

lgtm then, if we have confirmed it works properly

lgtm then, if we have confirmed it works properly
qyriad merged commit 71f268f215 into main 2024-04-22 03:57:50 +00:00
qyriad commented 2024-04-22 03:58:15 +00:00
Author
Owner
Copy link

Hopefully nothing should blow up 😅

Hopefully nothing should blow up 😅
Sign in to join this conversation.
Reviewers
No reviewers
lunaphied
jade
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#17
No description provided.
Delete branch "qyriad/nixos-module:call-package"

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?