alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
416561 commits 217 branches 121 tags 4.5 GiB
Commit graph

205 commits

Author SHA1 Message Date
Sergei Trofimovich 1bdc32f970 ocaml-ng.ocamlPackages_4_00_1.ocaml, ocaml-ng.ocamlPackages_4_08.ocaml: add -fcommon workaround 
Workaround build failure on -fno-common toolchains like upstream
gcc-10. Otherwise build fails as:

    $ nix build --impure --expr 'with import ./. {}; ocaml-ng.ocamlPackages_4_00_1.ocaml.overrideAttrs (oa: {   NIX_CFLAGS_COMPILE = (["-fno-common"] ++ [oa.NIX_CFLAGS_COMPILE or ""]); })'
    ...
    > ld: libcamlrun.a(startup.o):(.bss+0x800): multiple definition of `caml_code_fragments_table'; libcamlrun.a(backtrace.o):(.bss+0x20): first defined here
    > collect2: error: ld returned 1 exit status
 2022-05-28 13:37:55 +01:00
Adam Joseph b3fe9c32f8 ber_metaocaml: n107 -> n111 
The configure script has changed and no longer seems to provide a way
to specify the location of the x11 libraries or headers.  Therefore
these configure options have been dropped.
 2022-05-26 09:41:10 +02:00
Adam Joseph 4b8488f72a ber-metaocaml: make useX11 be a parameter rather than a let-binding 
This allows callers to choose the value of useX11 themselves, for
example in config.nix.
 2022-05-24 18:09:50 +02:00
Adam Joseph be15e454d8 ber-metaocaml: apply glibc>=2.34 fix from ocaml/4.07.nix 2022-05-20 02:00:26 -07:00
Anders Kaseorg 6920d8ca42 treewide: Simplify negated uses of versionAtLeast, versionOlder 
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
 2022-04-25 13:35:24 -07:00
Vincent Laporte d8d2136718 ocaml 4.00 – 4.09: make compatible with glibc-2.34 2022-04-06 21:30:10 +02:00
github-actions[bot] c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
ajs124 aa2c7c30df metaocaml_3_09: remove after being marked broken for over two years 
It was marked in commit ea171c39d7 by Kirill Boltaev on 2016-09-19 (commited on 2016-09-26)
 2022-04-03 16:14:17 +01:00
github-actions[bot] 5e1c018e60
Merge master into staging-next 2022-04-01 06:01:23 +00:00
Vincent Laporte 3a5df670ef ocaml-ng.ocamlPackages_4_14.ocaml: 4.14.0-rc2 → 4.14.0 2022-04-01 06:54:57 +02:00
Vladimír Čunát 0a8b4eddd2
Merge branch 'master' into staging-next 2022-03-25 10:16:56 +01:00
Vincent Laporte f4998c542d ocaml-ng.ocamlPackages_4_14: 4.14.0-β1 → 4.14.0-rc2 2022-03-23 11:25:01 +01:00
Alyssa Ross d7e181ff83
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	pkgs/development/compilers/ocaml/4.12.nix
	pkgs/development/python-modules/oci/default.nix
	pkgs/tools/admin/bubblewrap/default.nix
 2022-03-14 12:33:16 +00:00
Vincent Laporte 9d13bf5b1c ocaml-ng.ocamlPackages_4_14.ocaml: init at 4.14.0-β1 2022-03-13 21:44:09 +01:00
Vincent Laporte 6107d3894b ocaml-ng.ocamlPackages_4_12.ocaml: 4.12.0 → 4.12.1 2022-03-12 09:34:07 +01:00
Felix Buehler 103f0186e1 ocaml: rename name to pname 2022-03-01 14:55:45 +01:00
Vladimír Čunát 4757815068
Merge #150128: ocaml: enable parallel building 
...into staging
 2022-02-28 08:11:16 +01:00
Sergei Trofimovich 238d634e4b ocaml: enable parallel building 
Enable parallel building for ocaml-4.08 and above. tested as:

    $ nix build -f. ocaml-ng.ocamlPackages_{4_{00_1,01_0,02,03,04,05,06,07,08,09,10,11,12,13},latest}.ocaml --keep-going

ocaml build system supports parallel building, but but for multiple
top-level targets at the same time as it usually spawns subprocess
$(MAKE) that occasionally conflict with one another. To work it around
we use tiny Makefile with a single rule that calls top-level targets
sequentially as makefile calls:

    nixpkgs_world_bootstrap_world_opt:
       $(MAKE) world
       $(MAKE) bootstrap
       $(MAKE) world.opt

On a 16-core machine ocaml-4.12 build speeds up from 6m55s to 1m35s.

Releases 4_00_1, 4_01_0, 4_04 and 4_05 still have some race in them.
Thus this change enables parallel builds only for ocaml-4.06 and above.

Adapted from #142723

upstreams's CI tests the parallel makefile: https://github.com/ocaml/ocaml/issues/10235#issuecomment-782100584
The limit was chosen to be 4.08 because it was released in 2019, not too
long before the above link.
 2022-02-27 12:00:00 +00:00
Maximilian Bosch bcf8aeff3c
ocaml 4.10/4.11: fix build w/glibc-2.34 
Failing Hydra build: https://hydra.nixos.org/build/155189331
Applied a smaller patch from Fedora's fork[1] as it also applies on
older versions.

That said, these versions seem unmaintained anyways, so we should
probably drop them entirely.

[1] https://pagure.io/fedora-ocaml/c/dfb5e954a04f59b0456cc4c0ddf3acaf22e0ff07?branch=fedora-35-4.12.0
 2022-02-27 10:25:39 +01:00
Maximilian Bosch 917b7e5fd2
ocaml: fix build w/glibc-2.34 
ChangeLog: https://hydra.nixos.org/build/154122673
 2022-02-27 10:25:39 +01:00
Ben Siraphob 39a0a70d29
treewide: fix homepages with permanent redirect to https 2021-12-29 22:06:47 +07:00
Robert Scott dc523cbb80 ocaml: heed hardeningDisable flags set for individual versions 
specifically this re-fixes ocaml 4.09 on clang by allowing its
hardeningDisable flags to take effect
 2021-11-25 21:13:12 +00:00
Vikram Narayanan 528716bb8e ocaml: Fix aarch64-darwin build 2021-11-22 12:19:55 -08:00
Ryan Burns 2175b157ac treewide: refactor isi686 && isx86_64 -> isx86 2021-11-20 17:50:41 -08:00
Vincent Laporte 87843991ef ocaml: fix assembler on darwin 2021-11-11 11:30:19 +01:00
Vincent Laporte 316effbc59 ocaml-ng.ocamlPackages_4_13.ocaml: 4.13.0 → 4.13.1 2021-10-11 16:01:29 +02:00
Vincent Laporte 450c0ab5e7 ocaml-ng.ocamlPackages_4_13.ocaml: 4.13.0-rc2 → 4.13.0 2021-09-25 22:26:37 +02:00
Vincent Laporte f837a27a8a ocaml-ng.ocamlPackages_4_13.ocaml: 4.13.0-rc1 → 4.13.0-rc2 2021-09-17 21:41:19 +02:00
Vincent Laporte c03d9a850a ocaml-ng.ocamlPackages_4_13.ocaml: 4.13.0-β1 → 4.13.0-rc1 2021-09-16 11:00:58 +02:00
Martin Weinelt e2575c7de1
Merge branch 'master' into staging-next 2021-08-30 16:08:03 +02:00
Vincent Laporte 39067594f5 ocaml-ng.ocamlPackages_4_13.ocaml: 4.13.0-α2 → 4.13.0-β1 2021-08-30 07:38:35 +02:00
Guillaume Girol 6506d2ae4d pkgsStatic.ocaml: migrate some logic from static adapter to ocaml 2021-08-19 09:30:48 +02:00
Guillaume Girol a2c566265e ocaml: add strictDeps = true 2021-08-19 09:30:46 +02:00
Guillaume Girol 061f70f8f7 ocaml: fix static compilation on recent versions 2021-08-19 09:29:55 +02:00
Artturi ebcd5f38ad
Merge pull request #125507 from superherointj/package-ocaml-description 
ocaml: update meta.description
 2021-08-07 02:32:06 +03:00
Vincent Laporte 621afb9980 ocaml-ng.ocamlPackages_4_13.ocaml: 4.13.0-α1 → 4.13.0-α2 2021-07-21 10:10:04 +02:00
Vincent Laporte 0887d7a747 ocaml-ng.ocamlPackages_4_13.ocaml: init at 4.13.0-α1 2021-06-12 09:21:31 +02:00
superherointj 805d252c3b ocaml: update meta.description 2021-06-03 11:16:27 -03:00
Sandro e43d6186ff
Merge pull request #114526 from bobrik/ivan/ocaml-4.10.2 
ocamlPackages.ocaml: 4.10.0 -> 4.10.2
 2021-03-22 21:31:23 +01:00
Jan Tojnar 6d1958ad2d
Merge branch 'staging-next' into staging 2021-03-04 22:16:45 +01:00
Vincent Laporte 1ec43e04cc ocaml-ng.ocamlPackages_4_11.ocaml: 4.11.1 → 4.11.2 2021-03-03 18:05:12 +01:00
github-actions[bot] f5bb0053a6
Merge staging-next into staging 2021-03-02 18:17:42 +00:00
sternenseemann 78ecc5257c pkgs/development/compilers/ocaml: remove 3.* expressions 
The attributes for these compilers have been removed, so there's no
reason to keep these expressions around.
 2021-03-02 15:41:17 +01:00
Ivan Babrou 2e1a7b94f3 ocamlPackages.ocaml: fix assembler detection for aarch64-darwin 2021-02-27 10:43:14 +01:00
Ivan Babrou 86702daaf2 ocamlPackages.ocaml: 4.10.0 -> 4.10.2 2021-02-26 20:27:13 -08:00
Antonio Nuno Monteiro 98cefe1d6b OCaml 4.12.--beta1 -> 4.12.0 2021-02-25 21:25:10 +01:00
Ben Siraphob acc5f7b18a pkgs/development/compilers: stdenv.lib -> lib 2021-01-23 08:57:37 +07:00
Antonio Nuno Monteiro 29954335b7 ocamlPackages_4_12.ocaml: alpha3 -> beta1 2021-01-21 21:59:09 +01:00
zowoq 31f5dd3f36 treewide: editorconfig fixes 
- remove trailing whitespace
- use spaces for indentation
 2021-01-20 09:11:11 +10:00
Vincent Laporte 75d69a0a27 ocaml-ng.ocamlPackages_4_12.ocaml: 4.12.0~α2 → 4.12.0~α3 2020-12-26 08:12:49 +01:00