commit 7500267ed9a32cd9799f616e811fa306ed70a950 · pyrox.dev/nixpkgs

+8

pkgs/development/interpreters/erlang/R24.nix

···

       1
       1
       +
       { mkDerivation }:

     

       2
       2
       +
       

     

       3
       3
       +
       # How to obtain `sha256`:

     

       4
       4
       +
       # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz

     

       5
       5
       +
       mkDerivation {

     

       6
       6
       +
         version = "24.0";

     

       7
       7
       +
         sha256 = "0p4p920ncsvls9q3czdc7wz2p7m15bi3nr4306hqddnxz1kxcm4w";

     

       8
       8
       +
       }

+2 -1

pkgs/development/interpreters/erlang/generic-builder.nix

···

       76
       76
        
           ./otp_build autoconf

     

       77
       77
        
         '';

     

       78
       78
        
       

     

       79
       79
       -
         configureFlags = [ "--with-ssl=${lib.getDev opensslPackage}" ]

     

       79
       79
       +
         configureFlags = [ "--with-ssl=${lib.getOutput "out" opensslPackage}" ]

     

       80
       80
       +
           ++ [ "--with-ssl-incl=${lib.getDev opensslPackage}" ] # This flag was introduced in R24

     

       80
       81
        
           ++ optional enableThreads "--enable-threads"

     

       81
       82
        
           ++ optional enableSmpSupport "--enable-smp-support"

     

       82
       83
        
           ++ optional enableKernelPoll "--enable-kernel-poll"

+1 -1

pkgs/top-level/all-packages.nix

···

       11874
       11874
        
         beam_nox = callPackage ./beam-packages.nix { wxSupport = false; };

     

       11875
       11875
        
       

     

       11876
       11876
        
         inherit (beam.interpreters)

     

       11877
       11877
       -
           erlang erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18

     

       11877
       11877
       +
           erlang erlangR24 erlangR23 erlangR22 erlangR21 erlangR20 erlangR19 erlangR18

     

       11878
       11878
        
           erlang_odbc erlang_javac erlang_odbc_javac erlang_basho_R16B02

     

       11879
       11879
        
           elixir elixir_1_11 elixir_1_10 elixir_1_9 elixir_1_8 elixir_1_7

     

       11880
       11880
        
           elixir_ls;

+15

pkgs/top-level/beam-packages.nix

···

       14
       14
        
       

     

       15
       15
        
           # Standard Erlang versions, using the generic builder.

     

       16
       16
        
       

     

       17
       17
       +
           # R24

     

       18
       18
       +
           erlangR24 = lib.callErlang ../development/interpreters/erlang/R24.nix {

     

       19
       19
       +
             wxGTK = wxGTK30;

     

       20
       20
       +
             # Can be enabled since the bug has been fixed in https://github.com/erlang/otp/pull/2508

     

       21
       21
       +
             parallelBuild = true;

     

       22
       22
       +
             autoconf = buildPackages.autoconf269;

     

       23
       23
       +
             inherit wxSupport;

     

       24
       24
       +
           };

     

       25
       25
       +
           erlangR24_odbc = erlangR24.override { odbcSupport = true; };

     

       26
       26
       +
           erlangR24_javac = erlangR24.override { javacSupport = true; };

     

       27
       27
       +
           erlangR24_odbc_javac = erlangR24.override {

     

       28
       28
       +
             javacSupport = true;

     

       29
       29
       +
             odbcSupport = true;

     

       30
       30
       +
           };

     

       31
       31
       +
       

     

       17
       32
        
           # R23

     

       18
       33
        
           erlangR23 = lib.callErlang ../development/interpreters/erlang/R23.nix {

     

       19
       34
        
             wxGTK = wxGTK30;