pyrox.dev
hol_light: 2016-07-23 -> 2017-07-06
-13
pkgs/applications/science/logic/hol_light/Makefile.patch
-13
pkgs/applications/science/logic/hol_light/Makefile.patch
···
1
-
Index: Makefile
2
-
===================================================================
3
-
--- a/Makefile (révision 199)
4
-
+++ b/Makefile (copie de travail)
5
-
@@ -59,7 +59,7 @@
6
-
then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \
7
-
else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \
8
-
then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \
9
-
- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" ; \
10
-
+ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" -o ${CAMLP5_VERSION} = "6.13" -o ${CAMLP5_VERSION} = "6.14" -o ${CAMLP5_VERSION} = "6.15" -o ${CAMLP5_VERSION} = "6.16" -o ${CAMLP5_VERSION} = "6.17" ; \
11
-
then cp pa_j_3.1x_6.11.ml pa_j.ml; \
12
-
else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \
13
-
fi \
+11
-5
pkgs/applications/science/logic/hol_light/default.nix
+11
-5
pkgs/applications/science/logic/hol_light/default.nix
···
1
-
{ stdenv, fetchFromGitHub, writeScript, ocaml, camlp5 }:
1
+
{ stdenv, fetchFromGitHub, fetchpatch, writeScript, ocaml, camlp5 }:
2
2
3
3
let
4
4
start_script = ''
···
9
9
in
10
10
11
11
stdenv.mkDerivation {
12
-
name = "hol_light-2016-07-23";
12
+
name = "hol_light-2017-07-06";
13
13
14
14
src = fetchFromGitHub {
15
15
owner = "jrh13";
16
16
repo = "hol-light";
17
-
rev = "67cff936dda719f0e0ee57ab9d07c779ff664660";
18
-
sha256 = "0r85ifdvsvk2cdv7s4a0kf9ha6jdznqmz7swvp577f8r182klr28";
17
+
rev = "0ad8cbdb4de08a38dac600f352555e8454499faa";
18
+
sha256 = "0px9hl1b0mkyqv84j0si1zdq4066ffdrhzp27p2iah9l8ynbvpaq";
19
19
};
20
20
21
21
buildInputs = [ ocaml camlp5 ];
22
22
23
-
patches = [ ./Makefile.patch ];
23
+
patches = [ (fetchpatch {
24
+
url = https://github.com/girving/hol-light/commit/f80524bad61fd6f6facaa42153b2e29d1eab4658.patch;
25
+
sha256 = "1563wp597vakhmsgg8940dpirzzfvvxqp75x3dnx20rvmi2n2xw0";
26
+
})
27
+
];
28
+
29
+
postPatch = "cp pa_j_3.1x_{6,7}.xx.ml";
24
30
25
31
installPhase = ''
26
32
mkdir -p "$out/lib/hol_light" "$out/bin"