commit df70ab86b3371fb55250f65eb10b8de3c55d6376 · pyrox.dev/nixpkgs

+2 -2

pkgs/development/compilers/ocaml/5.1.nix

···

       1
        
       import ./generic.nix {

     

       2
        
         major_version = "5";

     

       3
        
         minor_version = "1";

     

       4
       -
         patch_version = "0";

     

       5
       -
         sha256 = "sha256-bOjbOTqvwmTlr3McaPvrIJIKtq6E1b+TURllt0IzUas=";

     

       6
        
       }

···

       1
        
       import ./generic.nix {

     

       2
        
         major_version = "5";

     

       3
        
         minor_version = "1";

     

       4
       +
         patch_version = "1";

     

       5
       +
         sha256 = "sha256-jX6Yv9o76UBgK3o53PkSotL96reR7UDmKgmkzWfd7vE=";

     

       6
        
       }

+2 -1

pkgs/development/tools/ocaml/merlin/4.x.nix

···

       25
        
           "4.14.1" = "4.13-414";

     

       26
        
           "5.0.0" = "4.12-500";

     

       27
        
           "5.1.0" = "4.13-501";

     

       28
       -
           # "5.1.1" = "4.13.1-501";

     

       29
        
         };

     

       30
        
       

     

       31
        
         hashes = {

     
···

       34
        
           "4.12-500" = "sha256-j49R7KVzNKlXDL7WibTHxPG4VSOVv0uaz5/yMZZjkH8=";

     

       35
        
           "4.13-414" = "sha256-AlzxqTuh5AkW9dnPIv51abv7r0A/VOS3JOT5IHix2wM=";

     

       36
        
           "4.13-501" = "sha256-G/VrI+qBVj2wxuB2qE9P1M73IvDmqmTrBFAA6mp+NRE=";

     

       0
        
       
     

       37
        
         };

     

       38
        
       

     

       39
        
         version = lib.getAttr ocaml.version merlinVersions;

···

       25
        
           "4.14.1" = "4.13-414";

     

       26
        
           "5.0.0" = "4.12-500";

     

       27
        
           "5.1.0" = "4.13-501";

     

       28
       +
           "5.1.1" = "4.13.1-501";

     

       29
        
         };

     

       30
        
       

     

       31
        
         hashes = {

     
···

       34
        
           "4.12-500" = "sha256-j49R7KVzNKlXDL7WibTHxPG4VSOVv0uaz5/yMZZjkH8=";

     

       35
        
           "4.13-414" = "sha256-AlzxqTuh5AkW9dnPIv51abv7r0A/VOS3JOT5IHix2wM=";

     

       36
        
           "4.13-501" = "sha256-G/VrI+qBVj2wxuB2qE9P1M73IvDmqmTrBFAA6mp+NRE=";

     

       37
       +
           "4.13.1-501" = "sha256-NVfgX3DFsQghApEgWilCgr5O2WSkwKtenZZFSJ1wwa0=";

     

       38
        
         };

     

       39
        
       

     

       40
        
         version = lib.getAttr ocaml.version merlinVersions;