-
Notifications
You must be signed in to change notification settings - Fork 6
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
Nix include git untracked files #406
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should have a test (maybe in GarnSpec.hs
) that garn
behaves this way now. Happy to pair on that.
0336ffd
to
fc25e99
Compare
patches = (prevAttrs.patches or [ ]) ++ [ | ||
(final.fetchpatch { | ||
name = "include-untracked-files.patch"; | ||
url = "https://github.com/NixOS/nix/compare/2.17.1...jfroche:nix:feat/include-untracked-files-2.17.1.patch"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have rebased the pull request in the Nix repository. Due to the recent changes in the main branch, specifically the transition to the libgit2 git implementation, the PR can no longer be directly applied with our current Nix version (2.17.1).
To address this, I've initiated a branch to backport the necessary changes for version 2.17.1.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good to me. I think we can also remove the git add --intent-to-add flake.nix
call in src/Garn/GarnConfig.hs:192
as well as the FAQ entry on the website at website/src/pages/main.tsx:263-281
fc25e99
to
cd5d761
Compare
We still get the output of the
Not sure what would be the best to remove that. I also see a lot of |
c5166f1
to
78187c9
Compare
78187c9
to
4b9daad
Compare
Patch Nix so that it doesn't ignore untracked files in git anymore and continue to ignore files if they are in a .gitignore.
4b9daad
to
b0a6ae4
Compare
Patch Nix so that it doesn't ignore untracked files in git anymore and
continue to ignore files if they are in a .gitignore.