commit 454255ee58a66c3d9d133b6edb2ce845f71cf1ce · pyrox.dev/nixpkgs

+4 -13

pkgs/development/tools/build-managers/rebar3/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, fetchpatch,

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub,

     

       2
       2
        
         fetchHex, erlang, makeWrapper,

     

       3
       3
        
         writeScript, common-updater-scripts, coreutils, git, gnused, nix, rebar3-nix }:

     

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
       -
         version = "3.15.1";

     

       6
       6
       +
         version = "3.16.0";

     

       7
       7
        
         owner = "erlang";

     

       8
       8
        
         deps = import ./rebar-deps.nix { inherit fetchFromGitHub fetchHex; };

     

       9
       9
        
         rebar3 = stdenv.mkDerivation rec {

     
···

       16
       16
        
             inherit owner;

     

       17
       17
        
             repo = pname;

     

       18
       18
        
             rev = version;

     

       19
       19
       -
             sha256 = "1pcy5m79g0l9l3d8lkbx6cq1w87z1g3sa6wwvgbgraj2v3wkyy5g";

     

       19
       19
       +
             sha256 = "1yqvm37l5rn5dyg4sc2hv47930s2524qrdpnjwy3zqa27r7k5n36";

     

       20
       20
        
           };

     

       21
       21
        
       

     

       22
       22
        
           buildInputs = [ erlang ];

     

       23
       23
       -
       

     

       24
       24
       -
           patches = [

     

       25
       25
       -
             # TODO: remove this on next rebar3 release

     

       26
       26
       -
             (fetchpatch {

     

       27
       27
       -
               name = "escriptize-erl-libs";

     

       28
       28
       -
               url = "https://github.com/erlang/rebar3/commit/8049a92512420b0967a4c23acfa304d8ca7a712e.patch";

     

       29
       29
       -
               sha256 = "0jzdy7n2nz4v38nn76bgjcmssvqgvdhy9v2gl867ylwqn1y5sdm1";

     

       30
       30
       -
             })

     

       31
       31
       -
           ];

     

       32
       23
        
       

     

       33
       24
        
           postPatch = ''

     

       34
       25
        
             mkdir -p _checkouts _build/default/lib/

     
···

       109
       100
        
               # global-deps.patch makes it possible to use REBAR_GLOBAL_PLUGINS to

     

       110
       101
        
               # instruct rebar3 to always load a certain plugin. It is necessary since

     

       111
       102
        
               # REBAR_GLOBAL_CONFIG_DIR doesn't seem to work for this.

     

       112
       112
       -
               patches = old.patches ++ [ ./skip-plugins.patch ./global-plugins.patch ];

     

       103
       103
       +
               patches = [ ./skip-plugins.patch ./global-plugins.patch ];

     

       113
       104
        
             }));

     

       114
       105
        
           in stdenv.mkDerivation {

     

       115
       106
        
             pname = "rebar3-with-plugins";

+4 -9

pkgs/development/tools/build-managers/rebar3/rebar-deps.nix

···

       16
       16
        
           version = "1.8.1";

     

       17
       17
        
           sha256 = "sha256-5FdFrenEdqmkaeoIQOQYqxk2DcRPAaIzME4RikRIa6A=";

     

       18
       18
        
         };

     

       19
       19
       -
         parse_trans = fetchHex {

     

       20
       20
       -
           pkg = "parse_trans";

     

       21
       21
       -
           version = "3.3.1";

     

       22
       22
       -
           sha256 = "sha256-B82Vd4hfVjYtQU6MTE5r3xDUOodnq7ktJMvoskxUiIs=";

     

       23
       23
       -
         };

     

       24
       19
        
         getopt = fetchHex {

     

       25
       20
        
           pkg = "getopt";

     

       26
       21
        
           version = "1.0.1";

     
···

       33
       28
        
         };

     

       34
       29
        
         erlware_commons = fetchHex {

     

       35
       30
        
           pkg = "erlware_commons";

     

       36
       36
       -
           version = "1.4.0";

     

       37
       37
       -
           sha256 = "sha256-GF7PXPQ7qzoBPds2FM57un9seoJ5BOZOV9pU/N/c4uY=";

     

       31
       31
       +
           version = "1.5.0";

     

       32
       32
       +
           sha256 = "sha256-PnxvsrpMKbDdXf6dAxtmRJ4giOzsGoFGW9n94F7X0Ns=";

     

       38
       33
        
         };

     

       39
       34
        
         cth_readable = fetchHex {

     

       40
       35
        
           pkg = "cth_readable";

     
···

       48
       43
        
         };

     

       49
       44
        
         certifi = fetchHex {

     

       50
       45
        
           pkg = "certifi";

     

       51
       51
       -
           version = "2.5.3";

     

       52
       52
       -
           sha256 = "sha256-7VFqyzkpsQEgip1wAGLVIPOVPaO2uRjYZhBv+pgOHBA=";

     

       46
       46
       +
           version = "2.6.1";

     

       47
       47
       +
           sha256 = "sha256-UkyXtJkbOEndXBemMSI4licsawr0RneLpGdaHf9Tu34=";

     

       53
       48
        
         };

     

       54
       49
        
         bbmustache = fetchHex {

     

       55
       50
        
           pkg = "bbmustache";