commit c0691a0659a06a0edfaa529568982d34b88e7eb9 · pyrox.dev/nixpkgs

+3 -3

pkgs/development/compilers/compcert/default.nix

···

       4
       4
        
       

     

       5
       5
        
       stdenv.mkDerivation rec {

     

       6
       6
        
         name    = "compcert-${version}";

     

       7
       7
       -
         version = "2.5";

     

       7
       7
       +
         version = "2.6";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url    = "http://compcert.inria.fr/release/${name}.tgz";

     

       11
       11
       -
           sha256 = "15gxarl2a8mz33fdn8pycj0ccazgmllbg2940n7aqdjlz807p11n";

     

       11
       11
       +
           sha256 = "05sdxgg2w7ykw6xbcq6dl2kzxdz4qzhjajiawpy6490wqiji7wm1";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml menhir ]);

     

       14
       14
       +
         buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);

     

       15
       15
        
       

     

       16
       16
        
         enableParallelBuilding = true;

     

       17
       17

+4 -2

pkgs/top-level/all-packages.nix

···

       3883
       3883
        
       

     

       3884
       3884
        
         cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };

     

       3885
       3885
        
       

     

       3886
       3886
       -
         compcert = callPackage ../development/compilers/compcert (

     

       3886
       3886
       +
         compcert = callPackage ../development/compilers/compcert ((

     

       3887
       3887
        
           if system == "x86_64-linux"

     

       3888
       3888
        
           then { tools = pkgsi686Linux.stdenv.cc; }

     

       3889
       3889
        
           else {}

     

       3890
       3890
       -
         );

     

       3890
       3890
       +
         ) // {

     

       3891
       3891
       +
           ocamlPackages = ocamlPackages_4_02;

     

       3892
       3892
       +
         });

     

       3891
       3893
        
       

     

       3892
       3894
        
         cryptol = haskellPackages.cryptol;

     

       3893
       3895