commit cf8caed16990c1812bf7defdcccd0095de01b304 · pyrox.dev/nixpkgs

+11

pkgs/development/compilers/dotnet/wrapper.nix

···

       18
       18
        
         replaceVars,

     

       19
       19
        
         nugetPackageHook,

     

       20
       20
        
         xmlstarlet,

     

       21
       21
       +
         pkgs,

     

       21
       22
        
       }:

     

       22
       23
        
       type: unwrapped:

     

       23
       24
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     
···

       280
       281
        
               };

     

       281
       282
        
             }

     

       282
       283
        
             // lib.optionalAttrs (type == "sdk") ({

     

       284
       284
       +
               buildDotnetModule =

     

       285
       285
       +
                 (pkgs.appendOverlays [

     

       286
       286
       +
                   (self: super: {

     

       287
       287
       +
                     dotnet-sdk = finalAttrs.finalPackage;

     

       288
       288
       +
                     dotnet-runtime = finalAttrs.finalPackage.runtime;

     

       289
       289
       +
                   })

     

       290
       290
       +
                 ]).callPackage

     

       291
       291
       +
                   ../../../test/dotnet/default.nix

     

       292
       292
       +
                   { };

     

       293
       293
       +
       

     

       283
       294
        
               console = lib.recurseIntoAttrs {

     

       284
       295
        
                 # yes, older SDKs omit the comma

     

       285
       296
        
                 cs = mkConsoleTests "C#" "cs" "Hello,?\\ World!";

+1 -1

pkgs/test/dotnet/use-dotnet-from-env/default.nix

···

       26
       26
        
           '';

     

       27
       27
        
         });

     

       28
       28
        
       

     

       29
       29
       -
         runtimeVersion = lib.getVersion dotnet-runtime;

     

       29
       29
       +
         runtimeVersion = lib.head (lib.splitString "-" (lib.getVersion dotnet-runtime));

     

       30
       30
        
         runtimeVersionFile = builtins.toFile "dotnet-version.txt" runtimeVersion;

     

       31
       31
        
       in

     

       32
       32
        
       {