commit fd821c7eb38afb46dc5af74b59ffaa9b331a7e0b · pyrox.dev/nixpkgs

+3 -1

pkgs/development/compilers/haxe/default.nix

···

       53
       53
        
             hash,

     

       54
       54
        
             version,

     

       55
       55
        
             prePatch ? defaultPatch,

     

       56
       56
       +
             patches ? [ ],

     

       56
       57
        
           }:

     

       57
       58
        
           stdenv.mkDerivation {

     

       58
       59
        
             pname = "haxe";

     
···

       76
       77
        
               inherit hash;

     

       77
       78
        
             };

     

       78
       79
        
       

     

       79
       79
       -
             inherit prePatch;

     

       80
       80
       +
             inherit prePatch patches;

     

       80
       81
        
       

     

       81
       82
        
             buildFlags = [

     

       82
       83
        
               "all"

     
···

       165
       166
        
         haxe_4_3 = generic {

     

       166
       167
        
           version = "4.3.6";

     

       167
       168
        
           hash = "sha256-m/A0xxB3fw+syPmH1GPKKCcj0a2G/HMRKOu+FKrO5jQ=";

     

       169
       169
       +
           patches = [ ./extlib-1.8.0.patch ];

     

       168
       170
        
         };

     

       169
       171
        
       }

+26

pkgs/development/compilers/haxe/extlib-1.8.0.patch

···

       1
       1
       +
       diff --git a/src/context/typecore.ml b/src/context/typecore.ml

     

       2
       2
       +
       index dc38a5264..0c3ebde9f 100644

     

       3
       3
       +
       --- a/src/context/typecore.ml

     

       4
       4
       +
       +++ b/src/context/typecore.ml

     

       5
       5
       +
       @@ -294,7 +294,7 @@ let add_local ctx k n t p =

     

       6
       6
       +
        			begin try

     

       7
       7
       +
        				let v' = PMap.find n ctx.locals in

     

       8
       8
       +
        				(* ignore std lib *)

     

       9
       9
       +
       -				if not (List.exists (ExtLib.String.starts_with p.pfile) ctx.com.std_path) then begin

     

       10
       10
       +
       +				if not (List.exists (ExtLib.String.starts_with ~prefix:p.pfile) ctx.com.std_path) then begin

     

       11
       11
       +
        					warning ctx WVarShadow "This variable shadows a previously declared variable" p;

     

       12
       12
       +
        					warning ~depth:1 ctx WVarShadow (compl_msg "Previous variable was here") v'.v_pos

     

       13
       13
       +
        				end

     

       14
       14
       +
       diff --git a/src/optimization/dce.ml b/src/optimization/dce.ml

     

       15
       15
       +
       index 4e7b1fc98..90d8fc5d6 100644

     

       16
       16
       +
       --- a/src/optimization/dce.ml

     

       17
       17
       +
       +++ b/src/optimization/dce.ml

     

       18
       18
       +
       @@ -76,7 +76,7 @@ let overrides_extern_field cf c =

     

       19
       19
       +
        	loop c cf

     

       20
       20
       +
        

     

       21
       21
       +
        let is_std_file dce file =

     

       22
       22
       +
       -	List.exists (ExtString.String.starts_with file) dce.std_dirs

     

       23
       23
       +
       +	List.exists (ExtString.String.starts_with ~prefix:file) dce.std_dirs

     

       24
       24
       +
        

     

       25
       25
       +
        let keep_metas = [Meta.Keep;Meta.Expose]

     

       26
       26
       +

+3 -5

pkgs/development/ocaml-modules/extlib/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildDunePackage rec {

     

       9
       9
        
         pname = "extlib";

     

       10
       10
       -
         version = "1.7.9";

     

       11
       11
       -
       

     

       12
       12
       -
         minimalOCamlVersion = "4.02";

     

       10
       10
       +
         version = "1.8.0";

     

       13
       11
        
       

     

       14
       12
        
         src = fetchurl {

     

       15
       15
       -
           url = "https://ygrek.org/p/release/ocaml-${pname}/${pname}-${version}.tar.gz";

     

       16
       16
       -
           hash = "sha512-I4asafA36lIINcBiTTmun7/+Q6ILGOJH3gMiMu1vQZ1me1PSMUxvVtxx02i/C2IBpWwvPypb39kzdmxabLmHaA==";

     

       13
       13
       +
           url = "https://github.com/ygrek/ocaml-extlib/releases/download/${version}/extlib-${version}.tar.gz";

     

       14
       14
       +
           hash = "sha256-lkJ38AEoCo7d/AjgcB1Zygxr3F0FIxOz5A5QiPbUXXA=";

     

       17
       15
        
         };

     

       18
       16
        
       

     

       19
       17
        
         nativeBuildInputs = [ cppo ];