Skip to content

wrangler: 3.80.1 -> 4.16.0#377334

Closed
liberodark wants to merge 1 commit intoNixOS:masterfrom
liberodark:wrangler
Closed

wrangler: 3.80.1 -> 4.16.0#377334
liberodark wants to merge 1 commit intoNixOS:masterfrom
liberodark:wrangler

Conversation

@liberodark
Copy link
Contributor

@liberodark liberodark commented Jan 27, 2025

Fix :

Information :

  • Broken symlinks: nixpkgs build now checks for broken symlinks, this PR
    adds all the relevant directories back to the out dir so all symlinks
    are intact.
  • Missing npm: wrangler specifies an older of pnpm than the one in
    pnpm_9 as used in the build process, this PR patches the package.json
    to use the pnpm version that is currently present in the build
    environment, this way when we update pnpm_9 again wrangler will still
    build.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Jan 27, 2025
@ryand56 ryand56 mentioned this pull request Jan 27, 2025
13 tasks
@liberodark
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 377334


x86_64-linux

✅ 1 package built:
  • wrangler

@devurandom devurandom mentioned this pull request Feb 14, 2025
3 tasks
@devurandom
Copy link
Contributor

Would this also fix #381980 ?

@liberodark liberodark force-pushed the wrangler branch 2 times, most recently from 7473c21 to 1fcff8a Compare February 14, 2025 09:21
@liberodark liberodark changed the title wrangler: 3.80.1 -> 3.105.1 wrangler: 3.80.1 -> 3.109.0 Feb 14, 2025
@Defelo
Copy link
Member

Defelo commented Feb 15, 2025

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 377334

Logs: https://github.com/Defelo/nixpkgs-review-gha/actions/runs/13340539050


x86_64-linux

❌ 1 package failed to build:
  • wrangler

aarch64-linux

❌ 1 package failed to build:
  • wrangler

x86_64-darwin

❌ 1 package failed to build:
  • wrangler

aarch64-darwin

❌ 1 package failed to build:
  • wrangler

@happysalada
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 377334


x86_64-darwin

❌ 1 package failed to build:
  • wrangler

@happysalada
Copy link
Contributor

Here is the error I ran into

/private/tmp/nix-build-wrangler-pnpm-deps.drv-0/tmp.7cnV05JXse/Lib
rary/pnpm/.tools/pnpm/9.12.0/bin/pnpm: line 16: exec: node: not found

this appears to be a pnpm error.

@ryand56
Copy link
Member

ryand56 commented Feb 17, 2025

Here is the error I ran into

/private/tmp/nix-build-wrangler-pnpm-deps.drv-0/tmp.7cnV05JXse/Lib
rary/pnpm/.tools/pnpm/9.12.0/bin/pnpm: line 16: exec: node: not found

this appears to be a pnpm error.

I'm getting that as well, also this error on my flake as well: https://github.com/ryand56/wrangler/actions/runs/13279400288/job/37074675503#step:5:209
Will take a look soon.

@cameronraysmith
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 377334

Logs: https://github.com/cameronraysmith/nixpkgs-review-gha/actions/runs/13470268211


x86_64-linux

❌ 1 package failed to build:
  • wrangler

aarch64-linux

❌ 1 package failed to build:
  • wrangler

x86_64-darwin

❌ 1 package failed to build:
  • wrangler

aarch64-darwin

❌ 1 package failed to build:
  • wrangler

@liberodark
Copy link
Contributor Author

With the last release now we have :

/build/tmp.DwhPGi3JzK/.local/share/pnpm/.tools/pnpm/9.12.0/bin/pnpm: exec: line 16: node: not found

@liberodark liberodark marked this pull request as draft February 22, 2025 20:46
@cameronraysmith
Copy link
Member

#381980 (comment)

@liberodark
Copy link
Contributor Author

#381980 (comment)

Im not sure is ok to use : dontCheckForBrokenSymlinks i need to ask for that.

@AmazinAxel
Copy link
Contributor

AmazinAxel commented Feb 24, 2025

Im not sure is ok to use : dontCheckForBrokenSymlinks i need to ask for that.

I think it should be fine to use but it should be considered temporary - if you can figure out how to fix the missing symlinks that would be the preferred solution
Other prs have been merged with dontCheckForBrokenSymlinks and since this is temporary I think it will be fine - #370750 (comment)

@liberodark liberodark force-pushed the wrangler branch 2 times, most recently from 3446912 to 3224c1b Compare February 24, 2025 07:44
@GaetanLepage
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 377334


x86_64-linux

❌ 1 package failed to build:
  • wrangler

aarch64-linux

❌ 1 package failed to build:
  • wrangler

x86_64-darwin

❌ 1 package failed to build:
  • wrangler

aarch64-darwin

❌ 1 package failed to build:
  • wrangler

Comment on lines +104 to +108
nativeInstallCheckInputs = [
versionCheckHook
];
versionCheckProgramArg = "-v";
doInstallCheck = true;

This comment was marked as resolved.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your help, I do appreciate being explicit and yes it is intentional.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some programs like to print their full path somewhere in --help, which would make the check obsolete. So it's always a good idea to specify the argument.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like --version should take precedence over --help to minimize the likelihood of this, but I agree it is ultimately best to just be explicit.

@cameronraysmith cameronraysmith self-requested a review May 21, 2025 19:13
@cameronraysmith cameronraysmith added the 12.approvals: 2 This PR was reviewed and approved by two persons. label May 21, 2025
Copy link
Member

@ryand56 ryand56 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 377334
Commit: 2edbc076f0727ed3c10554429a02ab2870a6f5f5


x86_64-linux

✅ 1 package built:
  • wrangler

LGTM, basic functionality works

@ryand56 ryand56 added 12.approvals: 3+ This PR was reviewed and approved by three or more persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages. and removed 12.approvals: 2 This PR was reviewed and approved by two persons. labels May 21, 2025
@ezrizhu
Copy link
Member

ezrizhu commented May 21, 2025

from the resolved thread

we should probably edit the PR summary bullet point to reflect this, and could you also put the two bullet point in the git commit message after the wrangler: 3.80.1 -> 4.16.0 so its in the tree history? e.g., ezrizhu@c2ef848

@happysalada
Copy link
Contributor

Several people are involved in this PR, so i want to make sure im not doing anything against anyones wishes.

Im planning to merge this in 24h unless someone disagrees.

@ezrizhu
Copy link
Member

ezrizhu commented May 21, 2025

@liberodark could you also add me (ezrizhu) to the maintainers list if possible? I think I have a pretty good understanding of whats going on now since I did the symlinks and the pnpm stuff. If you want, that is- but I'd love to help in future issues.

@cameronraysmith
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 377334

Logs: https://github.com/cameronraysmith/nixpkgs-review-gha/actions/runs/15170527710


x86_64-linux (sandbox = true)

✅ 1 package built:
  • wrangler

aarch64-linux (sandbox = true)

✅ 1 package built:
  • wrangler

x86_64-darwin (sandbox = true)

✅ 1 package built:
  • wrangler

aarch64-darwin (sandbox = true)

✅ 1 package built:
  • wrangler

Copy link
Member

@cameronraysmith cameronraysmith left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved automatically following the successful run of nixpkgs-review.

@liberodark
Copy link
Contributor Author

liberodark commented May 21, 2025

@liberodark could you also add me (ezrizhu) to the maintainers list if possible? I think I have a pretty good understanding of whats going on now since I did the symlinks and the pnpm stuff. If you want, that is- but I'd love to help in future issues.

I think it's best if you do a PR to add yourself.
I don't mind doing it, but I don't know if it's best.

@liberodark
Copy link
Contributor Author

Several people are involved in this PR, so i want to make sure im not doing anything against anyones wishes.

Im planning to merge this in 24h unless someone disagrees.

Is good to me

@isabelroses
Copy link
Member

isabelroses commented May 21, 2025

I'm making an assumption here but based on the changes you cherry picked ezrizhu@042acb0 but left no credit?

Can we at least co-author @ezrizhu.

@liberodark
Copy link
Contributor Author

I'm making an assumption here but based on the changes you cherry picked ezrizhu@042acb0 but left no credit?

Can we at least co-author @ezrizhu.

Hi,
Sorry, no, I wasn't aware of this PR.
But in any case his comments are useful.

Best Regards

@ezrizhu
Copy link
Member

ezrizhu commented May 21, 2025

Hi, Sorry, no, I wasn't aware of this PR. I think you can see that I had already fixed it before creating this PR. But in any case his comments are useful.

Your commit: 8465fe6
My commit RE: symlink: 042acb0
My commit RE: pnpm: a4a318f

thoroughly confused,

ezri (she/her)

@liberodark
Copy link
Contributor Author

liberodark commented May 21, 2025

Hi, Sorry, no, I wasn't aware of this PR. I think you can see that I had already fixed it before creating this PR. But in any case his comments are useful.

Your commit: 8465fe6 My commit RE: symlink: 042acb0 My commit RE: pnpm: a4a318f

thoroughly confused,

ezri (she/her)

Yep I hadn't even seen the date.
But basically, I just saw that this PR was long and needed to be corrected.
I was inspired by the creator directly, not by your PR, sorry.

PS : In my mind have keep only that :
image
When you link one of your commits to your comment.
But that doesn't take anything away from your work.
And I have no problem closing this PR for yours if you prefer.
Personally, my only goal is to fix issues.

Copy link
Member

@ezrizhu ezrizhu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'll bite the bait

that screenshotted commit with the short writeup - c2ef848 - was made after your original commit with my diffs (8465fe6), which appears to be a line-by-line copy of my below two commits from yesterday

042acb0
a4a318f

Lines in question that is quite obvious:

8465fe6#diff-62f7294149d81149b2724158561ac4a54a57ab507239fe806de590326191c1b5R39-R74 (comment on line 74)

8465fe6#diff-62f7294149d81149b2724158561ac4a54a57ab507239fe806de590326191c1b5R62 (the mv line on line 62)

8465fe6#diff-62f7294149d81149b2724158561ac4a54a57ab507239fe806de590326191c1b5R34 (the sed line on line 34)

sure the sed line is arguable but the Update: comment? c'mon..


unrelated to above, could you update the commit msg to have below so the reasons for the change is in the git log tree.

* Broken symlinks: nixpkgs build now checks for broken symlinks, this PR
adds all the relevant directories back to the out dir so all symlinks are
intact.
* Missing npm: wrangler specifies an older version of pnpm than the one in
pnpm_9 as used in the build process, this PR patches the package.json to remove
the pnpm version so pnpm_9 doesn't attempt to change it's version resulting in a
pnpm binary not found error.

and if you want to actually credit me, append below that bit. (i don't care that much about the commit credits, but at least acknowledge you blatantly copied it. not inspired...

Co-authored-by: Ezri Zhu <me@ezrizhu.com>

im unsubbing from this thread, this has done nothing but to detract from my day. I am very new to nixpkgs but if the culture is always like this then I don't see a point in me trying to learn to contribute to this repo any further.

EDIT:
I have no qualms with you going ahead with your PR, but I do ask that you're at least receptive of my feedback and add the other part of my commit that you at least saw, which is the explanation in the commit message. I think the explanation being in the tree adheres to the commit conventions better and saves future maintainers the hassle of digging up this thread that is very long.

PS: I go by she/her. Please don't refer to me like that again.

@liberodark
Copy link
Contributor Author

Hi, @ezrizhu

I think you misunderstood, honestly.
I've never seen your PR before.
But I invite you to reopen your PR since I'm closing this one.
I think my English may not be good enough for that.
I also think I misunderstood your messages.
If I misunderstood or misspelled anything, I sincerely apologize.

Best Regards

@liberodark liberodark closed this May 21, 2025
@ezrizhu ezrizhu mentioned this pull request May 21, 2025
13 tasks
ezrizhu added a commit to ezrizhu/nixpkgs that referenced this pull request May 21, 2025
Also resolved below two build issues

* Broken symlinks: nixpkgs build now checks for broken symlinks, this PR
  adds all the relevant directories back to the out dir so all symlinks
  are intact.
* Missing npm: wrangler specifies an older version of pnpm than the one
  in pnpm_9 as used in the build process, this PR patches the
  package.json to remove the pnpm version so pnpm_9 doesn't attempt to
  change it's version resulting in a pnpm binary not found error. (with
  help from @cameronraysmith in NixOS#377334)
@ezrizhu ezrizhu mentioned this pull request May 21, 2025
13 tasks
@cameronraysmith
Copy link
Member

@liberodark @ezrizhu the miscommunication here is unfortunate and I hope it will not discourage either of you or others who review the discussion from contributing productively and in good faith in the future. I apologize if I misunderstood some important aspects of the history in association with #409499 in my enthusiasm to help get these updates reviewed. In my defense, #409499 did not appear referenced directly in the thread here, even via backlink, until it was closed.

I am glad a solution has been merged in #409572 .

opinion on low threshold for acknowledging shared contribution

@liberodark I think it probably makes sense to have a very low threshold to note the source and add co-authors to commits, especially if someone has ever put up a parallel PR even if you did not know about it, or, more relevant to this case, requests to be acknowledged with a very clear history of productive participation. You can usually get a user's github e-mail with gh api "users/${username}" --jq ".id" and add

Co-authored-by: ezrizhu <44515009+ezrizhu@users.noreply.github.com>
Co-authored-by: liberodark <4238928+liberodark@users.noreply.github.com>

to the commit to credit them without any risk to their privacy as long as you're careful to avoid signing someone's name on something they might actively disagree with.

Thank you for your contributions!

from competing parallel PRs to a stack-first in review mentality

Personally, I think a deeper problem here is with github ;)

"Allow PR reviewers to comment on and suggest changes to unedited lines of code"
https://github.com/orgs/community/discussions/4452

If @ezrizhu could have more easily suggested changes to lines that had not previously been edited by simply providing a patch file from her branch, it could often avoid similar scenarios where it seems there is a need to put up a parallel PR when one has already existed for a long period of time. I suppose you can submit a PR to the OPs fork targeting the PR source branch, which would create a clear historical record and update the older one if merged. Hmm, that actually kind of seems like a reasonable solution: https://github.com/orgs/community/discussions/4452#discussioncomment-13227929 .

Wow, this has actually happened before on your fork @liberodark

Kudos to you @dsluijk (resisted temptation to spam). I hope someone else finds this whimsical trace a fair tributary from an otherwise slightly depraved bit of discourse. Cheers.

ryand56 pushed a commit to ryand56/nixpkgs that referenced this pull request May 31, 2025
Also resolved below two build issues

* Broken symlinks: nixpkgs build now checks for broken symlinks, this PR
  adds all the relevant directories back to the out dir so all symlinks
  are intact.
* Missing npm: wrangler specifies an older version of pnpm than the one
  in pnpm_9 as used in the build process, this PR patches the
  package.json to remove the pnpm version so pnpm_9 doesn't attempt to
  change it's version resulting in a pnpm binary not found error. (with
  help from @cameronraysmith in NixOS#377334)

(cherry picked from commit 515e5fe)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.approvals: 3+ This PR was reviewed and approved by three or more persons. 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in any of the changed packages.

Projects

None yet

Development

Successfully merging this pull request may close these issues.