Commit 8bf19672 authored by David McFarland's avatar David McFarland
Browse files

dotnet: add suffix to stage0 package names

parent 031e1d90

pkgs/development/compilers/dotnet/packages.nix

+4 −3
Original line number Diff line number Diff line
@@ -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;

pkgs/development/compilers/dotnet/stage0.nix

+8 −2
Original line number Diff line number Diff line
@@ -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; }

pkgs/development/compilers/dotnet/stage1.nix

+6 −1
Original line number Diff line number Diff line
@@ -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 {

pkgs/development/compilers/dotnet/vmr.nix

+2 −1
Original line number Diff line number Diff line
@@ -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