commit 5a4a3a6433c2e8f555f77a2cb841ba386ced7f78 · pyrox.dev/nixpkgs

+20 -5

pkgs/development/ocaml-modules/ocsigen-deriving/default.nix

···

       1
       1
       -
       { stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4 }:

     

       1
       1
       +
       { stdenv, fetchzip, ocaml, findlib, ocamlbuild, oasis, ocaml_optcomp, camlp4

     

       2
       2
       +
       , num

     

       3
       3
       +
       }:

     

       4
       4
       +
       

     

       5
       5
       +
       let param =

     

       6
       6
       +
         if stdenv.lib.versionAtLeast ocaml.version "4.03"

     

       7
       7
       +
         then {

     

       8
       8
       +
           version = "0.8.1";

     

       9
       9
       +
           sha256 = "03vzrybdpjydbpil97zmir71kpsn2yxkjnzysma7fvybk8ll4zh9";

     

       10
       10
       +
           buildInputs = [ num ];

     

       11
       11
       +
         } else {

     

       12
       12
       +
           version = "0.7.1";

     

       13
       13
       +
           sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms";

     

       14
       14
       +
         };

     

       15
       15
       +
       in

     

       2
       16
        
       

     

       3
       3
       -
       let version = "0.7.1"; in

     

       17
       17
       +
       let inherit (param) version; in

     

       4
       18
        
       

     

       5
       19
        
       stdenv.mkDerivation {

     

       6
       20
        
         name = "ocsigen-deriving-${version}";

     

       7
       21
        
         src = fetchzip {

     

       8
       22
        
           url = "https://github.com/ocsigen/deriving/archive/${version}.tar.gz";

     

       9
       9
       -
           sha256 = "0gg3nr3iic4rwqrcc0qvfm9x0x57zclvdsnpy0z8rv2fl5isbzms";

     

       10
       10
       -
           };

     

       23
       23
       +
           inherit (param) sha256;

     

       24
       24
       +
         };

     

       11
       25
        
       

     

       12
       12
       -
         buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ];

     

       26
       26
       +
         buildInputs = [ ocaml findlib ocamlbuild oasis ocaml_optcomp camlp4 ]

     

       27
       27
       +
         ++ (param.buildInputs or []);

     

       13
       28
        
       

     

       14
       29
        
         createFindlibDestdir = true;

     

       15
       30

+12

pkgs/development/ocaml-modules/optcomp/META

···

       1
       1
       +
       # OASIS_START

     

       2
       2
       +
       # DO NOT EDIT (digest: ec844fa3189acb2a866b89a69d111ba4)

     

       3
       3
       +
       version = "1.6"

     

       4
       4
       +
       description = "Optional compilation with cpp-like directives"

     

       5
       5
       +
       requires = "camlp4"

     

       6
       6
       +
       archive(syntax, preprocessor) = "optcomp.cma"

     

       7
       7
       +
       archive(syntax, toploop) = "optcomp.cma"

     

       8
       8
       +
       archive(syntax, preprocessor, native) = "optcomp.cmxa"

     

       9
       9
       +
       archive(syntax, preprocessor, native, plugin) = "optcomp.cmxs"

     

       10
       10
       +
       exists_if = "optcomp.cma"

     

       11
       11
       +
       # OASIS_STOP

     

       12
       12
       +

+23 -1

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

···

       1
       1
       -
       { stdenv, fetchurl, ocaml, findlib, ocamlbuild, camlp4 }:

     

       1
       1
       +
       { stdenv, fetchurl, fetchpatch, ocaml, findlib, ocamlbuild, camlp4 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation {

     

       4
       4
        
         name = "ocaml-optcomp-1.6";

     
···

       6
       6
        
           url = https://github.com/diml/optcomp/archive/1.6.tar.gz;

     

       7
       7
        
           sha256 = "0hhhb2gisah1h22zlg5iszbgqxdd7x85cwd57bd4mfkx9l7dh8jh";

     

       8
       8
        
         };

     

       9
       9
       +
       

     

       10
       10
       +
         patches =

     

       11
       11
       +
           let inherit (stdenv.lib) optional versionAtLeast; in

     

       12
       12
       +
           optional (versionAtLeast ocaml.version "4.02") (fetchpatch {

     

       13
       13
       +
             url = "https://github.com/diml/optcomp/commit/b7f809360c9794b383a4bc0492f6df381276b429.patch";

     

       14
       14
       +
             sha256 = "1n095lk94jq1rwi0l24g2wbgms7249wdd31n0ji895dr6755s93y";

     

       15
       15
       +
           })

     

       16
       16
       +
         ;

     

       9
       17
        
         

     

       10
       18
        
         createFindlibDestdir = true;

     

       11
       19
        
       

     

       12
       20
        
         buildInputs = [ ocaml findlib ocamlbuild camlp4 ];

     

       13
       21
        
       

     

       22
       22
       +
         configurePhase = ''

     

       23
       23
       +
           cp ${./META} META

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         buildPhase = ''

     

       27
       27
       +
           ocamlbuild src/optcomp.cmxs src/optcomp.cma src/optcomp_o.native src/optcomp_r.native

     

       28
       28
       +
         '';

     

       29
       29
       +
       

     

       30
       30
       +
         installPhase = ''

     

       31
       31
       +
           mkdir -p $out/bin

     

       32
       32
       +
           cp _build/src/optcomp_o.native $out/bin/optcomp-o

     

       33
       33
       +
           cp _build/src/optcomp_r.native $out/bin/optcomp-r

     

       34
       34
       +
           ocamlfind install optcomp META _build/src/optcomp.{a,cma,cmxa,cmxs} _build/src/pa_optcomp.{cmi,cmx,mli}

     

       35
       35
       +
         '';

     

       14
       36
        
       

     

       15
       37
        
         meta =  {

     

       16
       38
        
           homepage = https://github.com/diml/optcomp;