-
-
Notifications
You must be signed in to change notification settings - Fork 15.4k
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.
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
dotnet-sdk: Add Darwin support to dotnetCorePackages #78787
Conversation
Signed-off-by: Jamie Winsor <jamie@onemoregame.com>
platformNames = { | ||
"x86_64-darwin" = "osx"; | ||
"x86_64-linux" = "linux"; | ||
}; | ||
platform = builtins.getAttr stdenv.system platformNames; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this gets evaluated before meta.platforms gets checked.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As an alternative, would it make sense to take platform
as an argument here, meaning that the invocation over in pkgs/development/compilers/dotnet/default.nix
includes the platform and platform-specific SHA together? I found it a little confusing that the invocation passes a SHA based on if stdenv.isLinux
and relies on this function to identify the platform separately.
@@ -11,12 +11,17 @@ assert builtins.elem type [ "aspnetcore" "netcore" "sdk"]; | |||
, libuuid | |||
, zlib | |||
, curl | |||
}: | |||
}: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
}: | |
}: | |
lib.assertMsg (lib.elem stdenv.system (lib.attrNames platformNames)) "${stdenv.system} is an unsupported platform"; |
@@ -45,12 +50,12 @@ in stdenv.mkDerivation rec { | |||
runHook postInstall | |||
''; | |||
|
|||
postFixup = '' | |||
postFixup = if stdenv.isLinux then '' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
postFixup = if stdenv.isLinux then '' | |
postFixup = lib.optionalString stdenv.isLinux '' |
sdk_3_1 = buildNetCoreSdk { | ||
version = "3.1.101"; | ||
sha512 = "eeee75323be762c329176d5856ec2ecfd16f06607965614df006730ed648a5b5d12ac7fd1942fe37cfc97e3013e796ef278e7c7bc4f32b8680585c4884a8a6a1"; | ||
sha512 = if stdenv.isLinux | ||
then "eeee75323be762c329176d5856ec2ecfd16f06607965614df006730ed648a5b5d12ac7fd1942fe37cfc97e3013e796ef278e7c7bc4f32b8680585c4884a8a6a1" | ||
else "1bs0p7jm5gaarc4ss6zfakzw03g0hf8vshlvjpdnxj9mjhssk45gv6h2jlamfkhb0w1a0i1y7j86w9haamwq62d3crg7dskdk76a25j"; | ||
}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think there's a more concise paradigm, but I forgot exactly how it's implemented, but it goes something like:
sha512 = {
"x86_64-darwin" = "1bs0p7jm5gaarc4ss6zfakzw03g0hf8vshlvjpdnxj9mjhssk45gv6h2jlamfkhb0w1a0i1y7j86w9haamwq62d3crg7dskdk76a25j";
"x86_64-linux" = "eeee75323be762c329176d5856ec2ecfd16f06607965614df006730ed648a5b5d12ac7fd1942fe37cfc97e3013e796ef278e7c7bc4f32b8680585c4884a8a6a1";
}."${stdenv.system}"
makes more sense if we ever care to support ARM32/ARM64 which would just be:
sha512 = {
"x86_64-darwin" = "1bs0p7jm5gaarc4ss6zfakzw03g0hf8vshlvjpdnxj9mjhssk45gv6h2jlamfkhb0w1a0i1y7j86w9haamwq62d3crg7dskdk76a25j";
"x86_64-linux" = "eeee75323be762c329176d5856ec2ecfd16f06607965614df006730ed648a5b5d12ac7fd1942fe37cfc97e3013e796ef278e7c7bc4f32b8680585c4884a8a6a1";
"aarch64-linux" = "xxx";
}."${stdenv.system}"
@jonringer thank you so much for the code review. I'll get these things addressed and refactored. Much appreciated! |
Thanks for getting the ball rolling on this @reset. I realised the .NET SDKs in nixpkgs were Linux-only yesterday and started making my own change before finding this PR. Can I help at all to keep the momentum up? |
Hello, I'm a bot and I thank you in the name of the community for your contributions. Nixpkgs is a busy repository, and unfortunately sometimes PRs get left behind for too long. Nevertheless, we'd like to help committers reach the PRs that are still important. This PR has had no activity for 180 days, and so I marked it as stale, but you can rest assured it will never be closed by a non-human. If this is still important to you and you'd like to remove the stale label, we ask that you leave a comment. Your comment can be as simple as "still important to me". But there's a bit more you can do: If you received an approval by an unprivileged maintainer and you are just waiting for a merge, you can @ mention someone with merge permissions and ask them to help. You might be able to find someone relevant by using Git blame on the relevant files, or via GitHub's web interface. You can see if someone's a member of the nixpkgs-committers team, by hovering with the mouse over their username on the web interface, or by searching them directly on the list. If your PR wasn't reviewed at all, it might help to find someone who's perhaps a user of the package or module you are changing, or alternatively, ask once more for a review by the maintainer of the package/module this is about. If you don't know any, you can use Git blame on the relevant files, or GitHub's web interface to find someone who touched the relevant files in the past. If your PR has had reviews and nevertheless got stale, make sure you've responded to all of the reviewer's requests / questions. Usually when PR authors show responsibility and dedication, reviewers (privileged or not) show dedication as well. If you've pushed a change, it's possible the reviewer wasn't notified about your push via email, so you can always officially request them for a review, or just @ mention them and say you've addressed their comments. Lastly, you can always ask for help at our Discourse Forum, or more specifically, at this thread or at #nixos' IRC channel. |
#88750 solves this, closing |
This PR builds upon #73262 by adding Darwin support to DotnetCore
sandbox
innix.conf
on non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
./result/bin/
)nix path-info -S
before and after)