Make the package set a parameter instead of using <nixpkgs> everywhere
#238
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
eamsden
commented
Nov 11, 2020
eamsden
commented
Nov 11, 2020
eamsden
commented
Nov 11, 2020
samueldr
force-pushed
the
eamsden/parameterize-package-set
branch
from
f9f4298 to
28494a8
Compare
|
Hi! 👋 Thanks for the contribution, sorry it took so long until I properly could take a look. I probably should have chimed up and said it'd take a while, but in the end it was needed, some things changed which needed some rework of your changes. But, don't fear, I implemented the changes. Can you review the updated change set, and more importantly, validate that it does work in your setup? |
samueldr
force-pushed
the
eamsden/parameterize-package-set
branch
from
28494a8 to
9ff6dca
Compare
samueldr
reviewed
Jan 8, 2021
samueldr
reviewed
Jan 8, 2021
samueldr
reviewed
Jan 8, 2021
samueldr
reviewed
Jan 8, 2021
samueldr
reviewed
Jan 8, 2021
samueldr
force-pushed
the
eamsden/parameterize-package-set
branch
from
9ff6dca to
c474ebb
Compare
|
(Force pushed an update on top of master to better test) |
samueldr
force-pushed
the
eamsden/parameterize-package-set
branch
4 times, most recently
from
b023cb7 to
66b6a5d
Compare
samueldr
reviewed
Jan 31, 2021
samueldr
force-pushed
the
eamsden/parameterize-package-set
branch
from
66b6a5d to
088e89d
Compare
Not needed.
samueldr
force-pushed
the
eamsden/parameterize-package-set
branch
from
088e89d to
61433b2
Compare
|
Last few pushes:
|
…ere. Co-authored-by: Samuel Dionne-Riel <samuel@dionne-riel.com> Co-authored-by: Edward Amsden <edward@blackriversoft.com>
Co-authored-by: Samuel Dionne-Riel <samuel@dionne-riel.com> Co-authored-by: Edward Amsden <edward@blackriversoft.com>
`modulesPath` is enough for our needs.
The solution is, ugh, to add `...` to allow additional params on kernel builder call derivations.
samueldr
force-pushed
the
eamsden/parameterize-package-set
branch
from
61433b2 to
d796d40
Compare
|
This final push, as I'm told, finally fixes hermetic eval when used as part of a flake. |
|
Hmm. Looks like the documentation build is still having issues with the kernel package eval. |
.ci/instantiate-all.nix wouldn't pass otherwise.
See NixOS/nixpkgs#111504 for the reason behind this workaround.
samueldr
force-pushed
the
eamsden/parameterize-package-set
branch
from
d796d40 to
ede8fa5
Compare
archseer
approved these changes
Feb 2, 2021
|
Even though a lot changed, thank you @eamsden for getting the ball rolling! |
|
Thank you, everyone that worked on this!
…On Tue, Feb 2, 2021, 11:54 Samuel Dionne-Riel ***@***.***> wrote:
Even though a lot changed, thank you @eamsden <https://github.com/eamsden>
for getting the ball rolling!
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#238 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AACP25H5NDF4G3OW2F4NHSDS5BKA5ANCNFSM4TR5GHXQ>
.
|
|
@samueldr no problem! Sorry I couldn't be around much to keep after it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR takes a
pkgsparameter to several files that previously referenced Nixpkgs/NixOS or paths from thence by the<nixpkgs>reference toNIX_PATH.In a couple of places, modules were being disabled by full path, when a relative path suffices. See the NixOS manual section Replace Modules.
This also opens the way for using Nix flakes, as
flakes.nixcan now reference files (including the top-leveldefault.nix) and simply pass in its nixpkgs input.This PR includes an overlay patching
configure.acin thebindderivation, as it breaks on cross-compilation otherwise. This was necessary to get it building with both my local nixpkgs channel and my checkout of the latest nixpkgs master. If preferred, this can be split into a separate PR.Fixes #206