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.

Sign up for GitHub

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

Jump to bottom

dotnet: nixfmt output of nuget-to-nix #361579

Merged
merged 3 commits into from
Dec 5, 2024
Merged

dotnet: nixfmt output of nuget-to-nix #361579

merged 3 commits into from
Dec 5, 2024

Conversation

corngood
Copy link
Contributor

@corngood corngood commented Dec 3, 2024 •
edited
Loading

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.

This was referenced Dec 3, 2024
Closed
Closed
@corngood corngood added the backport release-24.11 Backport PR automatically label Dec 3, 2024
@corngood
Copy link
Contributor Author

corngood commented Dec 3, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 361579

x86_64-linux

✅ 5 packages built:
  • dotnet-outdated
  • juniper
  • netcoredbg
  • tagger
  • yafc-ce

@MattSturgeon
Copy link
Contributor

Related discussion:

MattSturgeon
MattSturgeon approved these changes Dec 3, 2024
View reviewed changes
Copy link
Contributor

@MattSturgeon MattSturgeon left a comment

Choose a reason for hiding this comment

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

No issues from me. I think JSON lockfiles will be better in the long term, but I'm fine with this too.

I also believe concerns raised by others would be reassured if this is treated as a stopgap solution?

pkgs/build-support/dotnet/add-nuget-deps/default.nix
Comment on lines 70 to +71
nugetToNix = nuget-to-nix;
nixfmt = nixfmt-rfc-style;
Copy link
Contributor

@MattSturgeon MattSturgeon Dec 3, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Not really relevant to this PR, but rather than substituting these in, would it make sense to instead set PATH using lib.makeBinPath [ nuget-to-nix nixfmt-rfc-style ]?

@corngood
Copy link
Contributor Author

corngood commented Dec 3, 2024

We could also do this with or without actually updating the lockfiles. I have them in here now, which was useful to check the rebuild count, etc.

@corngood corngood force-pushed the dotnet-nixfmt-lockfiles branch from 4d4ea99 to 83a204c Compare December 5, 2024 13:37
@corngood
dotnet: nixfmt output of nuget-to-nix
597474a
@corngood
dotnet: use fallback target packages from current binary sdk
d343c85 
This was using the bootstrap SDK, which doesn't match the version of the
source-built SDK.  This will still be a problem if the binary and
source-built SDKs don't have the same version.
@corngood
Revert "scarab: remove nuget patch"
8fb55a6 
This reverts commit 7cd9f93.
@corngood corngood force-pushed the dotnet-nixfmt-lockfiles branch from 83a204c to f14a539 Compare December 5, 2024 15:47
@corngood corngood marked this pull request as ready for review December 5, 2024 15:51
@nix-owners nix-owners bot requested review from mmahut and RaghavSood December 5, 2024 15:52
@corngood
Copy link
Contributor Author

corngood commented Dec 5, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 361579

x86_64-linux

✅ 5 packages built:
  • dotnet-outdated
  • juniper
  • netcoredbg
  • scarab
  • yafc-ce

@MattSturgeon
Copy link
Contributor

We could also do this with or without actually updating the lockfiles. I have them in here now, which was useful to check the rebuild count, etc.

I think my preference would be not to do a treewide reformat yet. CI only requires formatting for new files (and already compliant files).

The nixpkgs-review build with the reformat is reassuring either way.

Depending on timing, there's a chance a JSON-based solution may be ready before many of these packages end up bumping their lockfiles.

Not that this is important either way. I have no objection to a reformat now.

@corngood corngood force-pushed the dotnet-nixfmt-lockfiles branch from f14a539 to 8fb55a6 Compare December 5, 2024 17:11
@corngood
Copy link
Contributor Author

corngood commented Dec 5, 2024

I think my preference would be not to do a treewide reformat yet. CI only requires formatting for new files (and already compliant files).

Done. I don't think there's really a good argument for regenerating, other than to prove that it can be done.

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin and removed 10.rebuild-darwin: 1-10 labels Dec 5, 2024
@corngood corngood merged commit 9bb136e into NixOS:master Dec 5, 2024
19 of 20 checks passed
@corngood corngood deleted the dotnet-nixfmt-lockfiles branch December 5, 2024 20:14
@nix-backports
Copy link

nix-backports bot commented Dec 5, 2024

Successfully created backport PR for release-24.11:

@nix-backports nix-backports bot mentioned this pull request Dec 5, 2024
Merged
1 task
@gepbird gepbird mentioned this pull request Dec 7, 2024
Merged
13 tasks
@MattSturgeon MattSturgeon mentioned this pull request Dec 14, 2024
Merged
13 tasks
@UlyssesZh UlyssesZh mentioned this pull request Dec 14, 2024
Open
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gepbird gepbird gepbird left review comments

@MattSturgeon MattSturgeon MattSturgeon approved these changes

@mmahut mmahut Awaiting requested review from mmahut

@RaghavSood RaghavSood Awaiting requested review from RaghavSood

Assignees
No one assigned
Labels
6.topic: dotnet Language: .NET 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@corngood @MattSturgeon @gepbird