Skip to content
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

Revert "Merge pull request #54980 from danbst/etc-relative" #56507

Merged
merged 1 commit into from Feb 28, 2019

Conversation

@danbst
Copy link
Contributor

@danbst danbst commented Feb 28, 2019

This reverts commit 0b91fa4, reversing
changes made to 183919a.

Motivation for this change

#56278
#54980 (comment)
#54980 (comment)
https://discourse.nixos.org/t/nixos-rebuild-switch-upgrade-error-directory-contains-user-files-symlinking-may-fail/2266

The isStatic check now doesn't work, which leads to warnings

This reverts commit 0b91fa4, reversing
changes made to 183919a.
@danbst danbst requested a review from Infinisil as a code owner Feb 28, 2019
@danbst danbst merged commit 79cc48c into NixOS:master Feb 28, 2019
1 check was pending
1 check was pending
grahamcofborg-eval Checking original out paths
Details
@danbst danbst deleted the danbst:revert-etc-relative branch Feb 28, 2019
@danbst
Copy link
Contributor Author

@danbst danbst commented Feb 28, 2019

@7c6f434c can you backport this to 19.03?

@7c6f434c
Copy link
Member

@7c6f434c 7c6f434c commented Feb 28, 2019

I have no idea what is going on. I would expect you to just directly push a revert directly, given that you didn't even wait for ofBorg checks — and then you could as well push the rever to both branches.

Whatever, reverted in release-19.03 just by git revert — I hope that's the intended action.

@danbst
Copy link
Contributor Author

@danbst danbst commented Feb 28, 2019

@7c6f434c I can't push to master branch (no rights?), so I have to do PRs...
Thanks

@danbst
Copy link
Contributor Author

@danbst danbst commented Feb 28, 2019

🤔 maybe that's because there is policy about signed commits?..

@7c6f434c
Copy link
Member

@7c6f434c 7c6f434c commented Feb 28, 2019

@danbst
Copy link
Contributor Author

@danbst danbst commented Mar 7, 2019

@7c6f434c figured this out. I had origin as https, after I changed it to ssh pushes work now. Probably https push won't work because 2FA is forced.

@7c6f434c
Copy link
Member

@7c6f434c 7c6f434c commented Mar 7, 2019

Actually, I push via HTTPS, but using a push token instead of password.

coreyoconnor added a commit to coreyoconnor/nixpkgs that referenced this pull request Mar 8, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.