nixpkgs mirror (for testing) github.com/NixOS/nixpkgs
nix
fork

Configure Feed

Select the types of activity you want to include in your feed.

comby: 1.5.1 -> 1.7.0

+16 -4
+16 -4
pkgs/development/tools/comby/default.nix
··· 11 11 , stdenv 12 12 }: 13 13 let 14 - mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ] }: 14 + mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ], preBuild ? "" }: 15 15 ocamlPackages.buildDunePackage rec { 16 - inherit pname; 17 - version = "1.5.1"; 16 + inherit pname preBuild; 17 + version = "1.7.0"; 18 18 useDune2 = true; 19 19 minimumOcamlVersion = "4.08.1"; 20 20 doCheck = true; ··· 23 23 owner = "comby-tools"; 24 24 repo = "comby"; 25 25 rev = version; 26 - sha256 = "1ipfrr6n1jyyryhm9zpn8wwgzfac1zgbjdjzrm00qcwc17r8x2hf"; 26 + sha256 = "sha256-Y2RcYvJOSqppmxxG8IZ5GlFkXCOIQU+1jJZ6j+PBHC4"; 27 27 }; 28 28 29 29 nativeBuildInputs = [ ··· 51 51 }; 52 52 53 53 combyKernel = mkCombyPackage { pname = "comby-kernel"; }; 54 + combySemantic = mkCombyPackage { pname = "comby-semantic"; extraBuildInputs = [ ocamlPackages.cohttp-lwt-unix ]; }; 54 55 in 55 56 mkCombyPackage { 56 57 pname = "comby"; 58 + 59 + # tests have to be removed before building otherwise installPhase will fail 60 + # cli tests expect a path to the built binary 61 + preBuild = '' 62 + substituteInPlace test/common/dune \ 63 + --replace "test_cli_list" "" \ 64 + --replace "test_cli_helper" "" \ 65 + --replace "test_cli" "" 66 + rm test/common/{test_cli_list,test_cli_helper,test_cli}.ml 67 + ''; 57 68 58 69 extraBuildInputs = [ 59 70 zlib ··· 97 86 ocamlPackages.ppx_expect 98 87 ocamlPackages.dune-configurator 99 88 ]; 89 + 100 90 }