brackets: 1.8 -> 1.9 #24775
brackets: 1.8 -> 1.9 #24775
Conversation
|
@ndowens, thanks for your PR! By analyzing the history of the files in this pull request, we identified @matejc, @edolstra and @NeQuissimus to be potential reviewers. |
| sha256 = "0b2k0vv1qwmsg1wckp71yrb86zp8zisskmzzvx9ir19bma9jzr42"; | ||
| name = "${name}.deb"; | ||
| }; | ||
| stdenv.mkDerivation rec { |
There was a problem hiding this comment.
Looks like this adds an additional space to each line.
There was a problem hiding this comment.
Used G=gg in VIM to fix some indent issues I noticed. May be because I used with stdenv.lib at top; look nearly the same if you use split view
There was a problem hiding this comment.
I don't follow? The patch seems like it shifts everything to the right, including lines which should not be indented.
There was a problem hiding this comment.
Fixed it, seen what you were talking about; and also I do not know what is going on with git rebase with me lately, I can't squish the commits. I asked in IRC but no one answered
There was a problem hiding this comment.
I usually just rebase onto master (or whatever branch I'm targeting), as in git fetch upstream master && git rebase -i upstream/master. That's much easier than having to work out how many steps to jump back &c.
There was a problem hiding this comment.
@joachifm me neither; as I am in the branch and yours didnt work either; lately it has been doing that for other packages too
There was a problem hiding this comment.
The only explanation that makes sense to me is that you're rebasing onto the wrong tip somehow. For example, have you verified that the upstream remote points to NixOS/nixpkgs and not your own fork?
There was a problem hiding this comment.
origin git@github.com:ndowens/nixpkgs.git (fetch)
origin git@github.com:ndowens/nixpkgs.git (push)
upstream https://github.com/nixos/nixpkgs (fetch)
upstream https://github.com/nixos/nixpkgs (push)
There was a problem hiding this comment.
and upstream/master is synchronized with upstream? If so I literally have no idea how it is that rebasing onto it wouldn't work. It certainly does for me ...
There was a problem hiding this comment.
AFAIK it is, I keep my repo up2date from upstream too; so I am unsure what is going on :\
Motivation for this change
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandboxinnix.confon non-NixOS)
nix-shell -p nox --run "nox-review wip"./result/bin/)