diff options
| author | happysalada <raphael@megzari.com> | 2021-09-25 19:50:28 +0900 |
|---|---|---|
| committer | happysalada <raphael@megzari.com> | 2021-09-25 19:50:28 +0900 |
| commit | 54051ba41855a1bbbe8ebe4d6f87386604fb6df9 (patch) | |
| tree | 1b44e6b2e6e9f738add2abd8cca678b58a550e61 | |
| parent | 2fb9f65c0a1c9d6624b5c0a237b3eaa9d14b8dcd (diff) | |
| download | nixpkgs-54051ba41855a1bbbe8ebe4d6f87386604fb6df9.tar nixpkgs-54051ba41855a1bbbe8ebe4d6f87386604fb6df9.tar.gz nixpkgs-54051ba41855a1bbbe8ebe4d6f87386604fb6df9.tar.bz2 nixpkgs-54051ba41855a1bbbe8ebe4d6f87386604fb6df9.tar.lz nixpkgs-54051ba41855a1bbbe8ebe4d6f87386604fb6df9.tar.xz nixpkgs-54051ba41855a1bbbe8ebe4d6f87386604fb6df9.tar.zst nixpkgs-54051ba41855a1bbbe8ebe4d6f87386604fb6df9.zip | |
comby: 1.5.1 -> 1.7.0
| -rw-r--r-- | pkgs/development/tools/comby/default.nix | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/pkgs/development/tools/comby/default.nix b/pkgs/development/tools/comby/default.nix index 6023d55ec12..9b77740979e 100644 --- a/pkgs/development/tools/comby/default.nix +++ b/pkgs/development/tools/comby/default.nix @@ -11,10 +11,10 @@ , stdenv }: let - mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ] }: + mkCombyPackage = { pname, extraBuildInputs ? [ ], extraNativeInputs ? [ ], preBuild ? "" }: ocamlPackages.buildDunePackage rec { - inherit pname; - version = "1.5.1"; + inherit pname preBuild; + version = "1.7.0"; useDune2 = true; minimumOcamlVersion = "4.08.1"; doCheck = true; @@ -23,7 +23,7 @@ let owner = "comby-tools"; repo = "comby"; rev = version; - sha256 = "1ipfrr6n1jyyryhm9zpn8wwgzfac1zgbjdjzrm00qcwc17r8x2hf"; + sha256 = "sha256-Y2RcYvJOSqppmxxG8IZ5GlFkXCOIQU+1jJZ6j+PBHC4"; }; nativeBuildInputs = [ @@ -51,10 +51,21 @@ let }; combyKernel = mkCombyPackage { pname = "comby-kernel"; }; + combySemantic = mkCombyPackage { pname = "comby-semantic"; extraBuildInputs = [ ocamlPackages.cohttp-lwt-unix ]; }; in mkCombyPackage { pname = "comby"; + # tests have to be removed before building otherwise installPhase will fail + # cli tests expect a path to the built binary + preBuild = '' + substituteInPlace test/common/dune \ + --replace "test_cli_list" "" \ + --replace "test_cli_helper" "" \ + --replace "test_cli" "" + rm test/common/{test_cli_list,test_cli_helper,test_cli}.ml + ''; + extraBuildInputs = [ zlib gmp @@ -86,4 +97,5 @@ mkCombyPackage { ocamlPackages.ppx_expect ocamlPackages.dune-configurator ]; + } |