Commit 25b82b35 authored by David McFarland's avatar David McFarland
Browse files

dotnet: combine binary and source update scripts

parent 928e583e

pkgs/development/compilers/dotnet/binary/build-dotnet.nix

+0 −9
Original line number Diff line number Diff line
@@ -205,15 +205,6 @@ mkWrapper type ( 
        );

        targetPackages = lib.mapAttrs (_: map forceSDKEval) targetPackages;

        inherit runtime aspnetcore;



        updateScript =

          let

            majorVersion = lib.concatStringsSep "." (lib.take 2 (lib.splitVersion version));

          in

          [

            ./update.sh

            majorVersion

          ];

      }

    );

pkgs/development/compilers/dotnet/binary/update.sh

+2 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ update() { 
        return 1

    fi



    : ${output:="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"/$sem_version/releases.nix}

    : ${output:="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"/../$sem_version/releases.nix}

    echo "Generating $output"



    # Make sure the x.y version is properly passed to .NET release metadata url.
@@ -413,6 +413,7 @@ in rec { 
        )> "$result"



    nixfmt "$result"

    mkdir -p "$(dirname -- "$output")"

    cp "$result" "$output"

    echo "Generated $output"

}

pkgs/development/compilers/dotnet/default.nix

+6 −7
Original line number Diff line number Diff line
@@ -84,30 +84,29 @@ let 
    // (

      let

        dotnet_6 = callPackage ./dotnet.nix {

          dir = ./6.0;

          channel = "6.0";

          withVMR = false;

        };



        dotnet_7 = callPackage ./dotnet.nix {

          dir = ./7.0;

          channel = "7.0";

          withVMR = false;

        };



        dotnet_8 = callPackage ./dotnet.nix {

          dir = ./8.0;

          channel = "8.0";

        };



        dotnet_9 = callPackage ./dotnet.nix {

          dir = ./9.0;

          channel = "9.0";

        };



        dotnet_10 = callPackage ./dotnet.nix {

          dir = ./10.0;

          channel = "10.0";

        };



        dotnet_11 = callPackage ./dotnet.nix {

          dir = ./11.0;

          allowPrerelease = true;

          channel = "11.0";

        };

      in

      lib.optionalAttrs config.allowAliases {

pkgs/development/compilers/dotnet/dotnet.nix

+16 −3
Original line number Diff line number Diff line
@@ -2,15 +2,15 @@ 
  config,

  callPackage,

  lib,

  dir ? null,

  releasesFile ? dir + "/releases.nix",

  channel,

  dir ? ./. + ("/" + channel),

  buildDotnetSdk,

  withVMR ? true,

  ...

}@attrs:



let

  binary = buildDotnetSdk releasesFile;

  binary = buildDotnetSdk (dir + "/releases.nix");



  sourcePackages = lib.optionalAttrs withVMR (callPackage ./source (attrs // { inherit binary; }));
@@ -18,5 +18,18 @@ let 
    lib.optionalAttrs config.allowAliases binary

    // lib.mapAttrs' (k: v: lib.nameValuePair "${k}-bin" v) binary

    // sourcePackages;



  suffix = lib.replaceStrings [ "." ] [ "_" ] channel;

  sdkAttr = "sdk_${suffix}" + lib.optionalString (!withVMR) "-bin";

in

pkgs

// {

  ${sdkAttr} = pkgs.${sdkAttr}.overrideAttrs (prev: {

    passthru = prev.passthru or { } // {

      updateScript = [

        ./update.sh

        channel

      ];

    };

  });

}

pkgs/development/compilers/dotnet/combine-deps.nix→pkgs/development/compilers/dotnet/source/combine-deps.nix

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  list,

  baseRid,

  otherRids,

  pkgs ? import ../../../.. { },

  pkgs ? import ../../../../.. { },

}:

let

  inherit (pkgs) writeText;