public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.camlp5: 7.10 → 7.11

This commit is contained in:
Vincent Laporte 2020-03-19 12:05:24 +01:00 committed by Jon
parent 1161c96a20
commit 8dddd8a07f
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/science/logic/hol_light/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, runtimeShell, fetchFromGitHub, ocaml, num, camlp5 }:
{ stdenv, runtimeShell, fetchFromGitHub, fetchpatch, ocaml, num, camlp5 }:
let
load_num =
@ -30,6 +30,11 @@ stdenv.mkDerivation {
sha256 = "0sxsk8z08ba0q5aixdyczcx5l29lb51ba4ip3d2fry7y604kjsx6";
};
patches = [(fetchpatch {
url = https://salsa.debian.org/ocaml-team/hol-light/-/raw/master/debian/patches/0004-Fix-compilation-with-camlp5-7.11.patch;
sha256 = "180qmxbrk3vb1ix7j77hcs8vsar91rs11s5mm8ir5352rz7ylicr";
})];
buildInputs = [ ocaml camlp5 ];
propagatedBuildInputs = [ num ];

6
pkgs/development/tools/ocaml/camlp5/default.nix
View File

@ -2,11 +2,11 @@
stdenv.mkDerivation {
name = "camlp5-7.10";
name = "camlp5-7.11";
src = fetchzip {
url = "https://github.com/camlp5/camlp5/archive/rel710.tar.gz";
sha256 = "1a1lgsc8350afdwmsznsys7m0c0cks4nw6irqz2f92g8g4vkk9b7";
url = "https://github.com/camlp5/camlp5/archive/rel711.tar.gz";
sha256 = "1s1f9i0r0czxlbnsaz4kvs2ahknmqxcm5ypl75g7scjcbl0an2x4";
};
buildInputs = [ ocaml ];