Conversation
|
2316558 to
3a79f99
Compare
|
[posting here from matrix to log this more permanently] |
3a79f99 to
9d3762c
Compare
9d3762c to
2797574
Compare
|
67ff343 to
64bd63a
Compare
|
|
You can also append Not very convenient, but at least you can see it all. |
60c791f to
9fb99da
Compare
9fb99da to
65a3336
Compare
|
Helpful command to review (finds changes that are not This is not a catch-all, but helps make sure nothing fishy is going on. |
LordGrimmauld
left a comment
There was a problem hiding this comment.
Current magic grep output:
From 65a333600d5c88a98d674f637d092807cfc12253 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <[email protected]>
Date: Mon, 7 Apr 2025 08:23:42 +0200
Subject: [PATCH] treewide: replace `rev` with `tag`
+ rev = version;
- # rev = version;
+ # tag = version;
- -e 's/^REVISION ?=.*/REVISION = ${src.rev}/' \
+ -e 's/^REVISION ?=.*/REVISION = ${src.tag}/' \
- -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.rev}/' \
+ -e 's/^GIT_COMMIT ?=.*/GIT_COMMIT = ${src.tag}/' \
- # rev = "v${version}";
+ # tag = "v${version}";These look fine, so my assumption is this PR isn't hiding something malicious (at least from a glance) and pretty sure this is correct too.
|
I testify that indeed, I'm not doing anything malicious. |
|
@drupol Thanks for this! I have a few questions, though:
Also: I don't think it was the best idea to self-merge this massive change after mere hours (where these sorts of questions could be asked), without any other committer reviewing it, nor even a heads up on Matrix. Please try to do better next time. :( |
|
Did you verify all of these tags exist, and that they give the same hash? |
|
Thank you for the feedback — here’s some background and clarification regarding this PR. It took me around two days to complete this work. It all began with #396740, which was initially a simple search-and-replace task. While working on that, I realised it would be more meaningful and semantically correct to replace instances of I started by identifying which fetchers support the While examining <fetcher> {
rev = ...;
}<fetcher> {
line1;
rev = ...;
}…and so on. I used VSCode exclusively for this. A representative search regex I used was something like: This would catch examples like: fetchFromGitHub {
owner = "foo";
repo = "bar";
rev = "foobar"; # ← this is the relevant line
}The process was iterative:
As you can imagine, this required a fair amount of scripting and testing. Once I was satisfied with the results, I pushed the PR. Regarding the merge: you're absolutely right, and I’ll be more mindful next time. I did ask for feedback in two different Matrix channels and received some responses, but I admit that merging it after only a few hours wasn't ideal. That said, I was resolving conflicts every 30 minutes due to the size and scope of the change, and feared it would become unmanageable if I delayed further. I also wish I had a good way to identify which packages required a rebuild, but I didn’t find a straightforward method for this. It would be great to have some documentation on how to do that efficiently. As a follow-up, I started cleaning up the Thanks again for the feedback — it’s much appreciated. |
Echoing this. If you cannot assert that you checked that the hashes didn’t change, I would suggest a revert at this point. We’re a month away from 25.05, I don’t think it’s worth the risk. |
|
After some discussion on Matrix, we've confirmed the affected FODs have not been verified, and decided to revert the change and reland once we're confident we're not breaking anything. |
|
@infinisil @philiptaron @wolfgangwalther Do any of y'all know why the eval failure caused by this PR wasn't caught by the eval action? I can reproduce it locally on master by commenting out , if you want to test without dealing with this massive commit. |
|
Did some preliminary debugging on the eval issue, and If I'm unable to fix it myself within the next few days, I'll open an issue to track this properly. |
|
I know the dev of |
I just mean the eval check, so unrelated. :) |
|
I just saw this, but for future reference the script in #368177 can be adapted to perform this operation and verify each change with |

Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.