dotnet: migrate nuget lockfiles to JSON #362278
Merged
+69,475
−52,698
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
6.topic: python
8.has: documentation
GGG-KILLER
force-pushed
the
nuget-lockfile-to-json
branch
from
466c5b9 to
f7e34db
Compare
GGG-KILLER
changed the title
GGG-KILLER
force-pushed
the
nuget-lockfile-to-json
branch
from
f7e34db to
a91a587
Compare
GGG-KILLER
force-pushed
the
nuget-lockfile-to-json
branch
from
a91a587 to
4996549
Compare
github-actions
bot
added
10.rebuild-darwin: 11-100
10.rebuild-linux: 11-100
and removed
10.rebuild-darwin: 1-10
10.rebuild-linux: 1-10
labels
GGG-KILLER
force-pushed
the
nuget-lockfile-to-json
branch
from
4996549 to
a29b4ca
Compare
This comment was marked as outdated.
This comment was marked as outdated.
github-actions
bot
added
10.rebuild-darwin: 1-10
10.rebuild-linux: 1-10
and removed
10.rebuild-darwin: 11-100
10.rebuild-linux: 11-100
labels
MattSturgeon
reviewed
Dec 6, 2024
corngood
reviewed
Dec 6, 2024
ofborg
bot
added
the
2.status: merge conflict
MattSturgeon
reviewed
Dec 6, 2024
In addition to loading nix lockfiles
GGG-KILLER
force-pushed
the
nuget-lockfile-to-json
branch
from
7856eeb to
2b4190a
Compare
GGG-KILLER
removed
the
2.status: merge conflict
corngood
approved these changes
Dec 18, 2024
|
Thanks for all the work on this. I'd like to merge it soon, but I just wanted to give anyone a last chance to raise an objection. |
wegank
added
the
12.approvals: 1
|
The backport will probably have to be done manually. We could also opt to not backport the tree-wide (as the Nix files still work) but that'd necessitate every update backport for dotnet packages to be backported manually. Given that we have nearly perfect QA for this (eval is the same), I don't see a great risk. |
Atemu
approved these changes
Dec 18, 2024
|
Backport failed for Please cherry-pick the changes locally and resolve any conflicts. git fetch origin release-24.11
git worktree add -d .worktree/backport-362278-to-release-24.11 origin/release-24.11
cd .worktree/backport-362278-to-release-24.11
git switch --create backport-362278-to-release-24.11
git cherry-pick -x 1726304559622bcd20c8e3b7006b41a09bada599 3cc4563eb2f435ddc0da0a4a39f509a7ff7ffb7c bccae9e7c0f234d41ae7c9aebbaaf4f65a27282c c94c5087cc19cc8339e2c4b3e7a1546f6e990fcc 8ea76507abb96c2bdb971b4f7fdadebeea627324 318b37a8d6d1991369606455b4b446a34811f49f 1cd9516969553291792021f1b327f0e2e2775b3c 2b4190a2c20a7d33062f5806b0a0f879082b2340 |
13 tasks
13 tasks
This was referenced Dec 19, 2024
13 tasks
13 tasks
Petingoso
added a commit
to Petingoso/nixpkgs
that referenced
this pull request
Dec 28, 2024
This is an attempt to package [Olympus](https://everestapi.github.io/), a GUI for installing Everest and managing Celeste mods. This is based on this [draft](NixOS#295258), with the authors permission. It maintains the previous issue of not being able to launch Steam versions of Celeste from the command line but that's not feasible without upstream changes. I only have to note that it has a popup complaining about finishing the installation but that's due to xdg-mime x-scheme-handler/everest not being set. Finally I want to note that it depends on lua51Packages.nfd, which is broken while [this](NixOS#309026) isn't merged so currently has the fix there. Finally, [Lönn](https://github.com/CelestialCartographers/Loenn) works as expected, being the installation managed by the program. Ahorn is deprecated(in favor of Loenn) and it crashes over trying to run dynamic executables olympus: fixed zenity argument olympus: bugfix add openssl to fhs olympus: fixed to use the default nfd instead of patched version olympus: changed location of ndf arg olympus: bugfix: add xdg-utils as runtime dependency to fix pop-up olympus: deleted zenity.patch Due to nfd lua package being fixed, this patch is no longer needed olympus: fix use of wrong nfd package olympus: bumped up version to 24.07.06.02 olympus: format files with nixfmt-rfc olympus: chores: comments, fixed lib conventions olympus: make wrappers properly, use standard build process, misc fixes olympus: update version, src; add updateScript olympus: avoid rec; use lib.getExe; remove redundant .out; minor changes olympus: use standard build process for dotnet; remove -nixos suffix in version; use new mono; add dotnet-runtime to fhs env olympus: 24.10.27.02 -> 24.11.23.01; fix version.txt; remove unnecessary dependencies; add miniinstaller and celeste wrapper; other misc change olympus-with-steam-run: init olympus: more flexible celeste wrapper olympus: accept emptry string and path as celeste wrapper; minor fix with lua cpath olympus: minor fix with lua cpath; add xdg-utils to path olympus: use standard lua-subprocess instead of fork olympus: make MiniInstaller be properly wrapped olympus: add option to skip handler olympus: tweaked platforms, tweaked miniinstaller-fhs olympus-with-steam-run: comment for reminder on fixing issues with relative paths olympus: removed extraneous package olympus: add extra wrapper options for mininstaller and loenn olympus: add more explicit comments, bump version olympus: fixed mismatched hash in olympus olympus: changed proprieties of miniinstaller-fhs (NixOS#336576) olympus: tweak miniinstallerWrapper olympus: migrated to deps.json (NixOS#362278) olympus: remove meta.mainProgram explicitly (NixOS#358550)
Petingoso
added a commit
to Petingoso/nixpkgs
that referenced
this pull request
Dec 28, 2024
This is an attempt to package [Olympus](https://everestapi.github.io/), a GUI for installing Everest and managing Celeste mods. This is based on this [draft](NixOS#295258), with the authors permission. It maintains the previous issue of not being able to launch Steam versions of Celeste from the command line but that's not feasible without upstream changes. I only have to note that it has a popup complaining about finishing the installation but that's due to xdg-mime x-scheme-handler/everest not being set. Finally I want to note that it depends on lua51Packages.nfd, which is broken while [this](NixOS#309026) isn't merged so currently has the fix there. Finally, [Lönn](https://github.com/CelestialCartographers/Loenn) works as expected, being the installation managed by the program. Ahorn is deprecated(in favor of Loenn) and it crashes over trying to run dynamic executables olympus: fixed zenity argument olympus: bugfix add openssl to fhs olympus: fixed to use the default nfd instead of patched version olympus: changed location of ndf arg olympus: bugfix: add xdg-utils as runtime dependency to fix pop-up olympus: deleted zenity.patch Due to nfd lua package being fixed, this patch is no longer needed olympus: fix use of wrong nfd package olympus: bumped up version to 24.07.06.02 olympus: format files with nixfmt-rfc olympus: chores: comments, fixed lib conventions olympus: make wrappers properly, use standard build process, misc fixes olympus: update version, src; add updateScript olympus: avoid rec; use lib.getExe; remove redundant .out; minor changes olympus: use standard build process for dotnet; remove -nixos suffix in version; use new mono; add dotnet-runtime to fhs env olympus: 24.10.27.02 -> 24.11.23.01; fix version.txt; remove unnecessary dependencies; add miniinstaller and celeste wrapper; other misc change olympus-with-steam-run: init olympus: more flexible celeste wrapper olympus: accept emptry string and path as celeste wrapper; minor fix with lua cpath olympus: minor fix with lua cpath; add xdg-utils to path olympus: use standard lua-subprocess instead of fork olympus: make MiniInstaller be properly wrapped olympus: add option to skip handler olympus: tweaked platforms, tweaked miniinstaller-fhs olympus-with-steam-run: comment for reminder on fixing issues with relative paths olympus: removed extraneous package olympus: add extra wrapper options for mininstaller and loenn olympus: add more explicit comments, bump version olympus: fixed mismatched hash in olympus olympus: changed proprieties of miniinstaller-fhs (NixOS#336576) olympus: tweak miniinstallerWrapper olympus: migrated to deps.json (NixOS#362278) olympus: remove meta.mainProgram explicitly (NixOS#358550)
Petingoso
added a commit
to Petingoso/nixpkgs
that referenced
this pull request
Dec 29, 2024
This is an attempt to package [Olympus](https://everestapi.github.io/), a GUI for installing Everest and managing Celeste mods. This is based on this [draft](NixOS#295258), with the authors permission. It maintains the previous issue of not being able to launch Steam versions of Celeste from the command line but that's not feasible without upstream changes. I only have to note that it has a popup complaining about finishing the installation but that's due to xdg-mime x-scheme-handler/everest not being set. Finally I want to note that it depends on lua51Packages.nfd, which is broken while [this](NixOS#309026) isn't merged so currently has the fix there. Finally, [Lönn](https://github.com/CelestialCartographers/Loenn) works as expected, being the installation managed by the program. Ahorn is deprecated(in favor of Loenn) and it crashes over trying to run dynamic executables olympus: fixed zenity argument olympus: bugfix add openssl to fhs olympus: fixed to use the default nfd instead of patched version olympus: changed location of ndf arg olympus: bugfix: add xdg-utils as runtime dependency to fix pop-up olympus: deleted zenity.patch Due to nfd lua package being fixed, this patch is no longer needed olympus: fix use of wrong nfd package olympus: bumped up version to 24.07.06.02 olympus: format files with nixfmt-rfc olympus: chores: comments, fixed lib conventions olympus: make wrappers properly, use standard build process, misc fixes olympus: update version, src; add updateScript olympus: avoid rec; use lib.getExe; remove redundant .out; minor changes olympus: use standard build process for dotnet; remove -nixos suffix in version; use new mono; add dotnet-runtime to fhs env olympus: 24.10.27.02 -> 24.11.23.01; fix version.txt; remove unnecessary dependencies; add miniinstaller and celeste wrapper; other misc change olympus-with-steam-run: init olympus: more flexible celeste wrapper olympus: accept emptry string and path as celeste wrapper; minor fix with lua cpath olympus: minor fix with lua cpath; add xdg-utils to path olympus: use standard lua-subprocess instead of fork olympus: make MiniInstaller be properly wrapped olympus: add option to skip handler olympus: tweaked platforms, tweaked miniinstaller-fhs olympus-with-steam-run: comment for reminder on fixing issues with relative paths olympus: removed extraneous package olympus: add extra wrapper options for mininstaller and loenn olympus: add more explicit comments, bump version olympus: fixed mismatched hash in olympus olympus: changed proprieties of miniinstaller-fhs (NixOS#336576) olympus: tweak miniinstallerWrapper olympus: migrated to deps.json (NixOS#362278) olympus: remove meta.mainProgram explicitly (NixOS#358550) olympus: bump to 24.12.28.01 changes to new install process of net8.0
Petingoso
added a commit
to Petingoso/nixpkgs
that referenced
this pull request
Dec 29, 2024
This is an attempt to package [Olympus](https://everestapi.github.io/), a GUI for installing Everest and managing Celeste mods. This is based on this [draft](NixOS#295258), with the authors permission. It maintains the previous issue of not being able to launch Steam versions of Celeste from the command line but that's not feasible without upstream changes. I only have to note that it has a popup complaining about finishing the installation but that's due to xdg-mime x-scheme-handler/everest not being set. Finally I want to note that it depends on lua51Packages.nfd, which is broken while [this](NixOS#309026) isn't merged so currently has the fix there. Finally, [Lönn](https://github.com/CelestialCartographers/Loenn) works as expected, being the installation managed by the program. Ahorn is deprecated(in favor of Loenn) and it crashes over trying to run dynamic executables olympus: fixed zenity argument olympus: bugfix add openssl to fhs olympus: fixed to use the default nfd instead of patched version olympus: changed location of ndf arg olympus: bugfix: add xdg-utils as runtime dependency to fix pop-up olympus: deleted zenity.patch Due to nfd lua package being fixed, this patch is no longer needed olympus: fix use of wrong nfd package olympus: bumped up version to 24.07.06.02 olympus: format files with nixfmt-rfc olympus: chores: comments, fixed lib conventions olympus: make wrappers properly, use standard build process, misc fixes olympus: update version, src; add updateScript olympus: avoid rec; use lib.getExe; remove redundant .out; minor changes olympus: use standard build process for dotnet; remove -nixos suffix in version; use new mono; add dotnet-runtime to fhs env olympus: 24.10.27.02 -> 24.11.23.01; fix version.txt; remove unnecessary dependencies; add miniinstaller and celeste wrapper; other misc change olympus-with-steam-run: init olympus: more flexible celeste wrapper olympus: accept emptry string and path as celeste wrapper; minor fix with lua cpath olympus: minor fix with lua cpath; add xdg-utils to path olympus: use standard lua-subprocess instead of fork olympus: make MiniInstaller be properly wrapped olympus: add option to skip handler olympus: tweaked platforms, tweaked miniinstaller-fhs olympus-with-steam-run: comment for reminder on fixing issues with relative paths olympus: removed extraneous package olympus: add extra wrapper options for mininstaller and loenn olympus: add more explicit comments, bump version olympus: fixed mismatched hash in olympus olympus: changed proprieties of miniinstaller-fhs (NixOS#336576) olympus: tweak miniinstallerWrapper olympus: migrated to deps.json (NixOS#362278) olympus: remove meta.mainProgram explicitly (NixOS#358550) olympus: bump to 24.12.28.01 changes to new install process of net8.0 olympus : format
Petingoso
added a commit
to Petingoso/nixpkgs
that referenced
this pull request
Dec 31, 2024
This is an attempt to package [Olympus](https://everestapi.github.io/), a GUI for installing Everest and managing Celeste mods. This is based on this [draft](NixOS#295258), with the authors permission. It maintains the previous issue of not being able to launch Steam versions of Celeste from the command line but that's not feasible without upstream changes. I only have to note that it has a popup complaining about finishing the installation but that's due to xdg-mime x-scheme-handler/everest not being set. Finally I want to note that it depends on lua51Packages.nfd, which is broken while [this](NixOS#309026) isn't merged so currently has the fix there. Finally, [Lönn](https://github.com/CelestialCartographers/Loenn) works as expected, being the installation managed by the program. Ahorn is deprecated(in favor of Loenn) and it crashes over trying to run dynamic executables olympus: fixed zenity argument olympus: bugfix add openssl to fhs olympus: fixed to use the default nfd instead of patched version olympus: changed location of ndf arg olympus: bugfix: add xdg-utils as runtime dependency to fix pop-up olympus: deleted zenity.patch Due to nfd lua package being fixed, this patch is no longer needed olympus: fix use of wrong nfd package olympus: bumped up version to 24.07.06.02 olympus: format files with nixfmt-rfc olympus: chores: comments, fixed lib conventions olympus: make wrappers properly, use standard build process, misc fixes olympus: update version, src; add updateScript olympus: avoid rec; use lib.getExe; remove redundant .out; minor changes olympus: use standard build process for dotnet; remove -nixos suffix in version; use new mono; add dotnet-runtime to fhs env olympus: 24.10.27.02 -> 24.11.23.01; fix version.txt; remove unnecessary dependencies; add miniinstaller and celeste wrapper; other misc change olympus-with-steam-run: init olympus: more flexible celeste wrapper olympus: accept emptry string and path as celeste wrapper; minor fix with lua cpath olympus: minor fix with lua cpath; add xdg-utils to path olympus: use standard lua-subprocess instead of fork olympus: make MiniInstaller be properly wrapped olympus: add option to skip handler olympus: tweaked platforms, tweaked miniinstaller-fhs olympus-with-steam-run: comment for reminder on fixing issues with relative paths olympus: removed extraneous package olympus: add extra wrapper options for mininstaller and loenn olympus: add more explicit comments, bump version olympus: fixed mismatched hash in olympus olympus: changed proprieties of miniinstaller-fhs (NixOS#336576) olympus: tweak miniinstallerWrapper olympus: migrated to deps.json (NixOS#362278) olympus: remove meta.mainProgram explicitly (NixOS#358550) olympus: bump to 24.12.28.01 changes to new install process of net8.0 olympus : format olympus: changed install path, tweaked meta info
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This changes the
buildDotnetModulelockfiles to be JSON instead of Nix.Changes were made in a backwards-compatible fashion, however a warning was added to guide users to migrate to the new format.
Existing in-tree packages were migrated to the new format using a helper script and manual changes for places that didn't have the file directly specified.
cc: @NixOS/dotnet @MattSturgeon @UlyssesZh @TomaSajt @SuperSandro2000 @Atemu
Closes #362182, closes #325053.
Fixes #358025.
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.