From 8bf19672de1337f0cfe878aeeeb7460ec65fc31c Mon Sep 17 00:00:00 2001 From: David McFarland Date: Fri, 11 Oct 2024 22:35:10 -0300 Subject: [PATCH] dotnet: add suffix to stage0 package names --- pkgs/development/compilers/dotnet/packages.nix | 7 ++++--- pkgs/development/compilers/dotnet/stage0.nix | 10 ++++++++-- pkgs/development/compilers/dotnet/stage1.nix | 7 ++++++- pkgs/development/compilers/dotnet/vmr.nix | 3 ++- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/dotnet/packages.nix b/pkgs/development/compilers/dotnet/packages.nix index f9a5190d1588..b32bf3f2d9cf 100644 --- a/pkgs/development/compilers/dotnet/packages.nix +++ b/pkgs/development/compilers/dotnet/packages.nix @@ -7,6 +7,7 @@ strip-nondeterminism, zip, nugetPackageHook, + baseName ? "dotnet", fallbackTargetPackages ? { }, }: @@ -93,7 +94,7 @@ let }; sdk = mkCommon "sdk" rec { - pname = "dotnet-sdk"; + pname = "${baseName}-sdk"; version = releaseManifest.sdkVersion; src = vmr; @@ -147,7 +148,7 @@ let }; runtime = mkCommon "runtime" rec { - pname = "dotnet-runtime"; + pname = "${baseName}-runtime"; version = releaseManifest.runtimeVersion; src = vmr; @@ -172,7 +173,7 @@ let }; aspnetcore = mkCommon "aspnetcore" rec { - pname = "dotnet-aspnetcore-runtime"; + pname = "${baseName}-aspnetcore-runtime"; version = releaseManifest.aspNetCoreVersion or releaseManifest.runtimeVersion; src = vmr; diff --git a/pkgs/development/compilers/dotnet/stage0.nix b/pkgs/development/compilers/dotnet/stage0.nix index b10f0ac2cc32..e8be69d1f038 100644 --- a/pkgs/development/compilers/dotnet/stage0.nix +++ b/pkgs/development/compilers/dotnet/stage0.nix @@ -12,6 +12,7 @@ patchNupkgs, symlinkJoin, + baseName ? "dotnet", releaseManifestFile, tarballHash, depsFile, @@ -34,7 +35,12 @@ let vmr = (mkVMR { - inherit releaseManifestFile tarballHash bootstrapSdk; + inherit + baseName + releaseManifestFile + tarballHash + bootstrapSdk + ; }).overrideAttrs (old: rec { prebuiltPackages = mkNugetDeps { @@ -138,4 +144,4 @@ let }; }); in -mkPackages { inherit vmr; } +mkPackages { inherit baseName vmr; } diff --git a/pkgs/development/compilers/dotnet/stage1.nix b/pkgs/development/compilers/dotnet/stage1.nix index 94fb0fa24c70..0aa67615ade5 100644 --- a/pkgs/development/compilers/dotnet/stage1.nix +++ b/pkgs/development/compilers/dotnet/stage1.nix @@ -13,7 +13,12 @@ let mkPackages = callPackage ./packages.nix; mkVMR = callPackage ./vmr.nix; - stage0 = callPackage ./stage0.nix args; + stage0 = callPackage ./stage0.nix ( + args + // { + baseName = "dotnet-stage0"; + } + ); vmr = (mkVMR { diff --git a/pkgs/development/compilers/dotnet/vmr.nix b/pkgs/development/compilers/dotnet/vmr.nix index 8d2044c7424e..7cdbd36e9b5d 100644 --- a/pkgs/development/compilers/dotnet/vmr.nix +++ b/pkgs/development/compilers/dotnet/vmr.nix @@ -28,6 +28,7 @@ unzip, yq, + baseName ? "dotnet", bootstrapSdk, releaseManifestFile, tarballHash, @@ -63,7 +64,7 @@ let in stdenv.mkDerivation rec { - pname = "dotnet-vmr"; + pname = "${baseName}-vmr"; version = release; # TODO: fix this in the binary sdk packages