Skip to content

Make mkDotnet compatible with buildDotnetModule #13

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

Merged
adampoit merged 1 commit into from
Jul 7, 2026
Merged

Make mkDotnet compatible with buildDotnetModule #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions src/nix-dotnet.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@
defaultInstallScriptSha256 = "0hp4gjss641gabh24wf1xsxp9y1vb48fna5vc9ag24rp614nhahh";
dotnetLibraryPath = pkgs.lib.makeLibraryPath [pkgs.stdenv.cc.cc pkgs.zlib pkgs.icu pkgs.openssl];

buildDotnetModulePassthru = finalSdk: {
packages = [finalSdk];
icu = pkgs.icu;
};

finalizeRawSdk = rawSdk:
if pkgs.stdenv.isLinux
then
pkgs.stdenv.mkDerivation {
then let
finalSdk = pkgs.stdenv.mkDerivation {
pname = rawSdk.pname;
inherit (rawSdk) version;

Expand Down Expand Up @@ -80,9 +85,11 @@
runHook postInstall
'';

passthru = rawSdk.passthru // {inherit rawSdk;};
passthru = rawSdk.passthru // {inherit rawSdk;} // buildDotnetModulePassthru finalSdk;
meta = rawSdk.meta;
}
};
in
finalSdk
else rawSdk;

mkDotnetSdk = {
Expand Down Expand Up @@ -251,10 +258,12 @@

dontFixup = true;

passthru = {
inherit sdkVersion workloads;
additionalSdkVersions = validatedAdditionalSdkVersions;
};
passthru =
{
inherit sdkVersion workloads;
additionalSdkVersions = validatedAdditionalSdkVersions;
}
// buildDotnetModulePassthru rawSdk;

meta = with pkgs.lib; {
description =
Expand Down
24 changes: 24 additions & 0 deletions tests/unit.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,30 @@ in {
];
};

testMkDotnetBuildDotnetModulePackages = {
expr = let
sdk = mkDotnetFrom validGlobalJson [] validOutputHash;
in
builtins.length sdk.packages == 1 && builtins.elemAt sdk.packages 0 == sdk;
expected = true;
};

testMkDotnetBuildDotnetModuleIcu = {
expr = let
sdk = mkDotnetFrom validGlobalJson [] validOutputHash;
in
sdk ? icu && sdk.icu ? outPath;
expected = true;
};

testMkDotnetPassthruBuildDotnetModulePackages = {
expr = let
sdk = mkDotnetFrom validGlobalJson [] validOutputHash;
in
builtins.length sdk.passthru.packages == 1 && builtins.elemAt sdk.passthru.packages 0 == sdk;
expected = true;
};

testMkDotnetRequiresVersionSource = {
expr = builtins.tryEval (dotnet.mkDotnet {
workloads = [];
Expand Down
Loading