commit bf0ae59408c9862a1e844a0ba4d5d2ebf63f41b3 · pyrox.dev/nixpkgs

+5 -1

pkgs/development/tools/ocaml/ocamlformat/default.nix

···

       48
       48
        
           version = "0.16.0";

     

       49
       49
        
         };

     

       50
       50
        
       

     

       51
       51
       -
         ocamlformat = ocamlformat_0_16_0;

     

       51
       51
       +
         ocamlformat_0_17_0 = mkOCamlformat {

     

       52
       52
       +
           version = "0.17.0";

     

       53
       53
       +
         };

     

       54
       54
       +
       

     

       55
       55
       +
         ocamlformat = ocamlformat_0_17_0;

     

       52
       56
        
       }

+24 -2

pkgs/development/tools/ocaml/ocamlformat/generic.nix

···

       20
       20
        
             "0.15.0" = "0190vz59n6ma9ca1m3syl3mc8i1smj1m3d8x1jp21f710y4llfr6";

     

       21
       21
        
             "0.15.1" = "1x6fha495sgk4z05g0p0q3zfqm5l6xzmf6vjm9g9g7c820ym2q9a";

     

       22
       22
        
             "0.16.0" = "1vwjvvwha0ljc014v8jp8snki5zsqxlwd7x0dl0rg2i9kcmwc4mr";

     

       23
       23
       +
             "0.17.0" = "0f1lxp697yq61z8gqxjjaqd2ns8fd1vjfggn55x0gh9dx098p138";

     

       23
       24
        
           }."${version}";

     

       24
       25
        
         }

     

       25
       26
        
       ; in

     
···

       36
       37
        
         pname = "ocamlformat";

     

       37
       38
        
         inherit src version;

     

       38
       39
        
       

     

       39
       39
       -
         minimumOCamlVersion = "4.06";

     

       40
       40
       +
         minimumOCamlVersion =

     

       41
       41
       +
           if lib.versionAtLeast version "0.17.0"

     

       42
       42
       +
           then "4.08"

     

       43
       43
       +
           else "4.06";

     

       40
       44
        
       

     

       41
       45
        
         useDune2 = true;

     

       42
       46
        
       

     

       43
       47
        
         buildInputs =

     

       44
       44
       -
           if lib.versionAtLeast version "0.15.1"

     

       48
       48
       +
           if lib.versionAtLeast version "0.17.0"

     

       49
       49
       +
           then [

     

       50
       50
       +
             base

     

       51
       51
       +
             cmdliner

     

       52
       52
       +
             fpath

     

       53
       53
       +
             odoc

     

       54
       54
       +
             re

     

       55
       55
       +
             stdio

     

       56
       56
       +
             uuseg

     

       57
       57
       +
             uutf

     

       58
       58
       +
             fix

     

       59
       59
       +
             menhir

     

       60
       60
       +
             dune-build-info

     

       61
       61
       +
             ocaml-version

     

       62
       62
       +
             # Changed since 0.16.0:

     

       63
       63
       +
             (ppxlib.override { version = "0.22.0"; })

     

       64
       64
       +
             ocaml-migrate-parsetree-2-1

     

       65
       65
       +
           ]

     

       66
       66
       +
           else if lib.versionAtLeast version "0.15.1"

     

       45
       67
        
           then [

     

       46
       68
        
             base

     

       47
       69
        
             cmdliner

+1 -1

pkgs/top-level/all-packages.nix

···

       10816
       10816
        
           ocamlformat # latest version

     

       10817
       10817
        
           ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0

     

       10818
       10818
        
           ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0

     

       10819
       10819
       -
           ocamlformat_0_15_1 ocamlformat_0_16_0;

     

       10819
       10819
       +
           ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0;

     

       10820
       10820
        
       

     

       10821
       10821
        
         orc = callPackage ../development/compilers/orc { };

     

       10822
       10822