commit 0dddd9b4fd8496b2a492c1743e78edf6daedc654 · pyrox.dev/nixpkgs

+10 -2

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

···

       13
       13
        
         ncurses,

     

       14
       14
        
         ppx_deriving,

     

       15
       15
        
         ppx_deriving_0_15,

     

       16
       16
       +
         ppx_deriving_0_33,

     

       17
       17
       +
         ppx_optcomp,

     

       16
       18
        
         coqPackages,

     

       17
       19
        
         version ?

     

       18
       20
        
           if lib.versionAtLeast ocaml.version "4.13" then

     

       19
       19
       -
             "3.0.1"

     

       21
       21
       +
             "3.3.0"

     

       20
       22
        
           else if lib.versionAtLeast ocaml.version "4.08" then

     

       21
       23
        
             "1.20.0"

     

       22
       24
        
           else

     
···

       32
       34
        
       

     

       33
       35
        
       let

     

       34
       36
        
         fetched = coqPackages.metaFetch ({

     

       37
       37
       +
           release."3.3.0".sha256 = "sha256:963f95eea48b8f853cca9cbe4db49f22343c58e88dc961bc1da303356ef50dcd";

     

       35
       38
        
           release."3.0.1".sha256 = "sha256-r4B0xn6UCVslVW4dHiqq8NBMGfNz44kZy48KDWeGquc=";

     

       36
       39
        
           release."2.0.7".sha256 = "sha256-gCM+vZK6vWlhSO1VMjiWHse23mvxVwRarhxwkIQK7e0=";

     

       37
       40
        
           release."2.0.6".sha256 = "sha256-tRUYXQZ0VXrjIZBZ1skdzieUsww4rSNEe5ik+iKpk3U=";

     
···

       76
       79
        
         buildInputs = [

     

       77
       80
        
           ncurses

     

       78
       81
        
         ]

     

       82
       82
       +
         ++ lib.optional (lib.versionAtLeast version "3.3.0" || version == "dev") ppx_optcomp

     

       79
       83
        
         ++ lib.optional (lib.versionAtLeast version "1.16" || version == "dev") atdgen-runtime;

     

       80
       84
        
       

     

       81
       85
        
         propagatedBuildInputs = [

     
···

       84
       88
        
         ]

     

       85
       89
        
         ++ (if lib.versionAtLeast version "1.15" || version == "dev" then [ menhirLib ] else [ camlp5 ])

     

       86
       90
        
         ++ (

     

       87
       87
       -
           if lib.versionAtLeast version "1.13" || version == "dev" then

     

       91
       91
       +
           if lib.versionAtLeast version "3.3.0" || version == "dev" then

     

       88
       92
        
             [

     

       89
       93
        
               ppx_deriving

     

       94
       94
       +
             ]

     

       95
       95
       +
           else if lib.versionAtLeast version "1.13" then

     

       96
       96
       +
             [

     

       97
       97
       +
               ppx_deriving_0_33

     

       90
       98
        
             ]

     

       91
       99
        
           else

     

       92
       100
        
             [

pkgs/development/rocq-modules/rocq-elpi/default.nix

···

       40
       40
        
               (case (range "9.0" "9.1") "2.6.0")

     

       41
       41
        
               (case ("9.0") "2.5.2")

     

       42
       42
        
             ] null;

     

       43
       43
       +
           release."3.1.0".sha256 = "sha256-ytGPGwJv+jmRT6uN0sg6q+xh8ND0PMIZ9ULB0Uwca1w=";

     

       43
       44
        
           release."3.0.0".sha256 = "sha256-YMe2is7duGcvAHjM4joUE90EloibjSxqfZThsJhstdU=";

     

       44
       45
        
           release."2.6.0".sha256 = "sha256-23BHq1NFUkI3ayXnGUwiGFySLyY3EuH4RyMgAhQqI4g=";

     

       45
       46
        
           release."2.5.2".sha256 = "sha256-lLzjPrbVB3rrqox528YiheUb0u89R84Xmrgkn0oplOs=";

+1 -1

pkgs/top-level/ocaml-packages.nix

···

       548
       548
        
                 in

     

       549
       549
        
                 {

     

       550
       550
        
                   ppx_deriving_0_15 = ppx_deriving_ "0.15";

     

       551
       551
       -
                   ppx_deriving = ppx_deriving_ "0.33.0";

     

       551
       551
       +
                   ppx_deriving_0_33 = ppx_deriving_ "0.33.0";

     

       552
       552
        
                 }

     

       553
       553
        
               );

     

       554
       554