Fix shell.nix by pinning nixpkgs #6213
Merged
Conversation
This file contains 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
drashna
requested review from
drashna,
algernon,
fredizzimo,
jackhumbert,
mechmerlin,
noroadsleft,
skullydazed,
yanfali and
zvecr
Closed
14 tasks
|
It looks like there is a merge conflict here. If you could update the PR to fix this? |
|
I've basically solved the conflict by overriding the changes made in #5913, because I think this PR addresses that by pinning all of |
|
Well, if the other PR does resolve the issues, then that's what I'd personally prefer to use. The lightest touch is best, IMO. But I will defer to others that have more experience with this (as ... well, I don't really have any with the shell.nex stuff) |
drashna
approved these changes
Sep 25, 2019
|
I would argue that we do want to pin all of nixpkgs so that it works regardless of users' environments. That way we can guarantee that it actually works. As it is now, we have no way of knowing what versions the user is running. Also, we can upgrade to newer versions as we want instead of relying on users to upgrade. |
|
Is there any update on this PR? Is there anything I can do to help it get merged? |
skullydazed
approved these changes
Nov 14, 2019
Shinichi-Ohki
added a commit
to Shinichi-Ohki/qmk_firmware
that referenced
this pull request
Nov 15, 2019
* 'master' of https://github.com/qmk/qmk_firmware: (475 commits) [Keyboard] kbdfans keyboards NKRO enable (qmk#7364) [Keyboard] fix DZ60RGB info.json (qmk#7362) Adding new pcb with default keymap and personal keymap (qmk#7314) [Core] Cleanup rules.mk for F303 keyboards (qmk#7306) [Docs] Japanese translation of docs/ja/newbs_best_practices.md (qmk#7337) Set device version from config.h for V-USB boards (qmk#7316) Add support for configurable polling interval and power usage o… (qmk#7336) capslock_led (qmk#7359) Move Ergodox EZ RGB Light code to custom driver (qmk#7309) Fix shell.nix by pinning nixpkgs (qmk#6213) [Keyboard] add kbdmini; dztech, kbdfans keyboards cleanup (qmk#7223) [Docs] Encourage newbs to not download the repo as a zip (qmk#7353) Update debounce docs (qmk#7355) [Keyboard] Add TG4x (qmk#7351) [Keyboard] Add FLX Virgo (qmk#7352) format code according to conventions [skip ci] Adding verd layout to RSII (qmk#7296) Add my custom layouts for GH60, DZ60 and Minivan (qmk#7278) [Keyboard] Added abnt2 layout to dz60 (qmk#7340) [Keyboard] add Little Keyboards as a seller of helix pcbs outside of japan (qmk#7249) ...
drashna
pushed a commit
to zsa/qmk_firmware
that referenced
this pull request
Nov 18, 2019
ripxorip
pushed a commit
to ripxorip/qmk_firmware
that referenced
this pull request
Dec 3, 2019
shajra
added a commit
to shajra/qmk_firmware
that referenced
this pull request
Dec 23, 2019
This refines PR qmk#6213 (commit 8dc9764), which pinned Nixpkgs. In general, pinning Nixpkgs is a good idea. But there's some problems with pinning it so hard. It makes it harder to experiment with more modern Nixpkgs without forking the codebase. In general it's nicer to be current if we can, because it decreases the likelihood of cache misses and having to pull a ton of stuff down from Hydra. So this commit tries to get the best of both worlds. The pinned version is still there as a default. But I can easily override it to test out later versions (which we'll want to do periodically anyway to not be perpetually stuck on an ancient version of Nixpkgs).
13 tasks
patrl
pushed a commit
to patrl/qmk_firmware
that referenced
this pull request
Dec 29, 2019
fdidron
pushed a commit
to zsa/qmk_firmware
that referenced
this pull request
Jan 6, 2020
fdidron
pushed a commit
to zsa/qmk_firmware
that referenced
this pull request
Jan 8, 2020
HokieGeek
pushed a commit
to HokieGeek/qmk_firmware
that referenced
this pull request
Feb 21, 2020
BorisTestov
pushed a commit
to BorisTestov/qmk_firmware
that referenced
this pull request
May 23, 2024
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.
Description
I tried to use
shell.nix, but I ran into a build issue. To fix it, I found a commit innixpkgsfrom around the time the file was made, and modifiedshell.nixto always use the version ofnixpkgsat that commit. That way even asnixpkgschanges, thisshell.nixfile should always work.I also tweaked the way we get around the fact that
dfu-programmerandteensy-loader-cliare erroneously marked as unsupported on darwin, so that it only affects those two packages. I'm not sure what the status of theses packages is for the current version ofnixpkgs, but maybe someone should submit a PR to nixpkgs to fix this upstream?Types of Changes
Checklist