Update ocaml and ocaml packages
more/packages/ocaml.scm
44 | 44 | #:use-module (gnu packages texinfo) | |
45 | 45 | #:use-module (more packages smt)) | |
46 | 46 | ||
47 | + | (define (ocaml-forge-uri name version file-number) | |
48 | + | (string-append "https://forge.ocamlcore.org/frs/download.php/" | |
49 | + | (number->string file-number) "/" name "-" version | |
50 | + | ".tar.gz")) | |
51 | + | ||
47 | 52 | (define-public ocaml-fix | |
48 | 53 | (package | |
49 | 54 | (inherit ocaml) | |
50 | - | (version "4.05.0") | |
55 | + | (version "4.06.0") | |
51 | 56 | (source (origin | |
52 | 57 | (method url-fetch) | |
53 | 58 | (uri (string-append | |
… | |||
56 | 61 | "/ocaml-" version ".tar.xz")) | |
57 | 62 | (sha256 | |
58 | 63 | (base32 | |
59 | - | "1y9fw1ci9pwnbbrr9nwr8cq8vypcxwdf4akvxard3mxl2jx2g984")))) | |
64 | + | "1dy542yfnnw10zvh5s9qzswliq11mg7l0bcyss3501qw3vwvadhj")))) | |
60 | 65 | (arguments | |
61 | 66 | `(#:modules ((guix build gnu-build-system) | |
62 | 67 | (guix build utils) | |
… | |||
226 | 231 | (package | |
227 | 232 | (inherit camlp4) | |
228 | 233 | (name "camlp4") | |
229 | - | (version "4.05+2") | |
234 | + | (version "4.06+1") | |
230 | 235 | (source (origin | |
231 | 236 | (method url-fetch) | |
232 | 237 | (uri (string-append "https://github.com/ocaml/camlp4/archive/" | |
… | |||
234 | 239 | (file-name (string-append name "-" version ".tar.gz")) | |
235 | 240 | (sha256 | |
236 | 241 | (base32 | |
237 | - | "0dd9scf50y0928syvxflljwry2dzm35n903fgpfdkpcn907jq96v")))) | |
242 | + | "08mrp8jjaayv0s50kmhjkafxqykff5dq3073hrl7ylx0km253k5i")))) | |
238 | 243 | (inputs `(("ocaml" ,ocaml-fix))) | |
239 | 244 | (native-inputs | |
240 | 245 | `(("ocaml" ,ocaml-fix) | |
… | |||
244 | 249 | (define-public ocaml-findlib-fix | |
245 | 250 | (package | |
246 | 251 | (inherit ocaml-findlib) | |
252 | + | (version "1.7.3") | |
253 | + | (source (origin | |
254 | + | (method url-fetch) | |
255 | + | (uri (string-append "http://download.camlcity.org/download/findlib-" | |
256 | + | version ".tar.gz")) | |
257 | + | (sha256 | |
258 | + | (base32 | |
259 | + | "12xx8si1qv3xz90qsrpazjjk4lc1989fzm97rsmc4diwla7n15ni")))) | |
260 | + | (arguments | |
261 | + | (substitute-keyword-arguments (package-arguments ocaml-findlib) | |
262 | + | ((#:phases phases) | |
263 | + | `(modify-phases ,phases | |
264 | + | (add-before 'build 'fix-findlib-makefile | |
265 | + | (lambda* (#:key outputs #:allow-other-keys) | |
266 | + | (substitute* "Makefile.config" | |
267 | + | (("OCAML_CORE_STDLIB=.*") | |
268 | + | (string-append "OCAML_CORE_STDLIB=" | |
269 | + | (assoc-ref outputs "out") "/lib/ocaml/site-lib" | |
270 | + | "\n"))) | |
271 | + | #t)))))) | |
247 | 272 | (native-inputs | |
248 | 273 | `(("camlp4" ,camlp4-fix) | |
249 | 274 | ("ocaml" ,ocaml-fix) | |
… | |||
267 | 292 | (define-public lablgtk-fix | |
268 | 293 | (package | |
269 | 294 | (inherit lablgtk) | |
295 | + | (version "2.18.6") | |
296 | + | (source (origin | |
297 | + | (method url-fetch) | |
298 | + | (uri (ocaml-forge-uri "lablgtk" version 1726)) | |
299 | + | (sha256 | |
300 | + | (base32 | |
301 | + | "1y38fdvswy6hmppm65qvgdk4pb3ghhnvz7n4ialf46340r1s5p2d")))) | |
302 | + | (arguments | |
303 | + | `(#:tests? #f ; no check target | |
304 | + | ||
305 | + | ;; opt: also install cmxa files | |
306 | + | #:make-flags (list "all" "opt" | |
307 | + | "OCAMLFIND=ocamlfind" | |
308 | + | "OCAMLLDCONF=ld.conf" | |
309 | + | (string-append "FINDLIBDIR=" | |
310 | + | (assoc-ref %outputs "out") | |
311 | + | "/lib/ocaml")) | |
312 | + | ;; Occasionally we would get "Error: Unbound module GtkThread" when | |
313 | + | ;; compiling 'gtkThInit.ml', with 'make -j'. So build sequentially. | |
314 | + | #:parallel-build? #f | |
315 | + | ||
316 | + | #:phases | |
317 | + | (modify-phases %standard-phases | |
318 | + | (add-before 'install 'prepare-install | |
319 | + | (lambda* (#:key inputs outputs #:allow-other-keys) | |
320 | + | (let ((out (assoc-ref outputs "out")) | |
321 | + | (ocaml (assoc-ref inputs "ocaml"))) | |
322 | + | ;; Install into the output and not the ocaml directory. | |
323 | + | (mkdir-p (string-append out "/lib/ocaml")) | |
324 | + | (substitute* "config.make" | |
325 | + | ((ocaml) out)) | |
326 | + | #t)))))) | |
327 | + | (home-page "http://lablgtk.forge.ocamlcore.org/") | |
270 | 328 | (native-inputs | |
271 | 329 | `(("ocaml" ,ocaml-fix) | |
272 | 330 | ("build" ,ocaml-build) |