281 Commits

Author SHA1 Message Date
Vincent Laporte 16611dafa6 ocaml: fix cross-compile by adding bootstrapping ocaml (#542468) 2026-07-24 08:34:00 +00:00
Ulrik Strid 243a3c1790 Update license of OCaml (#537796) 2026-07-16 14:32:07 +00:00
·𐑑𐑴𐑕𐑑𐑩𐑤 def7d4d5df ocaml: fix cross-compile by adding bootstrapping ocaml
Fixes cross compilation looking for ocamlc:

checking if the installed OCaml compiler can build the cross compiler... ./configure: line 4348: ocamlc: command not found
no (5.4.1 vs )
configure: error: exiting

Assisted-by: DeepSeek V4 Flash
2026-07-16 12:08:22 +07:00
Marek Kubica 5bae6f2287 ocaml: Update license
OCaml has switched away from QPL to LGPL2.1 around 10 years ago:
https://github.com/ocaml/ocaml/commit/7fc2d214c4ee8853615fc3e5649f45e11d85378d
at the 4.04 release.

Nixpkgs does not have such old versions so might as well set the version
for all of them to `lgpl21`.
2026-07-02 15:16:41 +02:00
Vincent Laporte 844b1a9267 ocamlPackages_5_5.ocaml: init at 5.5.0 2026-06-25 10:17:56 +02:00
Vincent Laporte 1e150a99b7 ocaml-ng.ocamlPackages_4_14.ocaml: 4.14.3 → 4.14.4 2026-06-16 13:44:32 +02:00
Michael Daniels bd963c137f ber_metaocaml: 114 -> 153 (#508161) 2026-05-16 18:09:12 +00:00
Vincent Laporte 7e6a9f58a3 ocaml-ng.ocamlPackages_4_14.ocaml: fix ARM64 bug 2026-04-17 14:39:17 +02:00
Xiangyan Sun a62f385df3 ber_metaocaml: 114 -> 153 2026-04-08 18:03:55 -07:00
Lisanna Dettwyler 9c4fe54281 ocaml: use https for sources
Signed-off-by: Lisanna Dettwyler <lisanna.dettwyler@gmail.com>
2026-03-21 12:31:03 -04:00
K900 2dd94c2c3c Merge remote-tracking branch 'origin/staging-next' into staging 2026-02-25 09:42:30 +03:00
Vincent Laporte 06cc3a2061 ocaml-ng.ocamlPackages_4_14.ocaml: 4.14.2 → 4.14.3 (#491859) 2026-02-25 05:19:27 +00:00
sternenseemann efffbc1e8f ocaml: 5.4.0 → 5.4.1 (#491997) 2026-02-19 10:27:18 +00:00
Vincent Laporte e5ff56535f ocaml: 5.4.0 → 5.4.1 2026-02-19 08:17:06 +01:00
Vincent Laporte 1ed3b4e4a9 ocaml-ng.ocamlPackages_4_14.ocaml: 4.14.2 → 4.14.3
ocaml-ng.ocamlPackages_4_14.earlybird: mark as broken
ocaml-ng.ocamlPackages_4_14.js_of_ocaml-compiler: mark broken versions 5
2026-02-18 21:15:07 +01:00
Michael Daniels 464b9d0b9d ocaml: fix formatting 2026-02-11 19:53:29 -05:00
Vladimír Čunát 6ec6fb0a7c ocaml: fixup build on darwin
https://hydra.nixos.org/build/321382407/nixlog/1/tail
I presume that this is about gcc vs. clang toolchain,
but I haven't tested.
2026-02-11 20:52:10 +01:00
K900 3c4102eef4 Merge remote-tracking branch 'origin/staging-next' into staging 2026-02-06 15:58:23 +03:00
quantenzitrone 55280fa564 various: rename references from libX11 to libx11
this shouldn't create any rebuilds
2026-02-06 00:24:34 +01:00
George Shammas b6368258c3 ocaml: Enable tests for the ocaml compilers 2026-01-21 07:05:40 -05:00
George Shammas cc3c8d8160 ocaml: Add georgyo to maintainers 2026-01-21 06:54:33 -05:00
Vincent Laporte 5fe9913616 ocaml: fix build with gcc15 for version 5.0 2025-12-31 10:53:43 +01:00
Vladimír Čunát d8a7cfb2de ocaml: avoid rebuilding the default version
Defining an env-var as an empty string would cause a rebuild.
2025-12-29 09:37:13 +01:00
definfo 4422c78d20 ocaml: fix build with gcc15 for version < 4.14
Fixes: https://hydra.nixos.org/build/316546402/nixlog/1

(and several packages relying on ocaml < 4.14 beside coq_8_15)
2025-12-29 14:37:16 +08:00
Ihar Hrachyshka 567e8dfd8e treewide: clean up 'meta = with' pattern
This commit was created by a combination of scripts and tools:
- an ast-grep script to prefix things in meta with `lib.`,
- a modified nixf-diagnose / nixf combination to remove unused `with
lib;`, and
- regular nixfmt.

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
2025-12-10 18:09:49 +01:00
nixpkgs-ci[bot] a6b2560cff Merge staging-next into staging 2025-10-15 18:06:33 +00:00
Weijia Wang 36c4abcd83 ocaml-ng: drop ocaml <=4.08 2025-10-14 20:57:37 +02:00
nixpkgs-ci[bot] a7c24797a7 Merge staging-next into staging 2025-10-14 06:06:40 +00:00
Vincent Laporte 6e07221e4d ocaml-ng.ocamlPackages_5_4: init at 5.4.0 2025-10-10 20:50:40 +02:00
Luna Nova e7fbed853b treewide: remove usages of obsolete pie hardening flag 2025-10-09 10:13:03 -07:00
Wolfgang Walther 5a0711127c treewide: run nixfmt 1.0.0 2025-07-24 13:55:40 +02:00
Pierre Villemot bb0ca5271d Add noNakedPointer option to the ocaml package (#404668) 2025-05-07 08:40:24 +02:00
Weijia Wang 8855e5cbdd ocaml: use bytecode compiler on loongarch64-linux 2025-04-26 19:52:34 +02:00
Peder Bergebakken Sundt 5aba99242e treewide: fix typos in comments
Made with

```shell
git restore .
fd '\.nix$' pkgs/ --type f -j1 -x bash -xc "$(cat <<"EOF"
    typos --no-check-filenames --write-changes "$1"
    git diff --exit-code "$1" && exit
    #( git diff "$1" | grep -qE "^\+ +[^# ]") && git restore "$1"
    count1="$( bat --language nix --diff --style changes "$1" --theme "Monokai Extended" --color always | aha --no-header | grep -E '^<span style="color:olive;">~</span> ' | wc -l )"
    count2="$( bat --language nix --diff --style changes "$1" --theme "Monokai Extended" --color always | aha --no-header | grep -E '^<span style="color:olive;">~</span> (<span style="color:#f8f8f2;"> *</span>)?<span style="color:#75715e;">.*</span>$' | wc -l )"
    [[ $count1 -ne $count2 ]] && git restore "$1"
EOF
)" -- {}
```

and filtered with `GIT_DIFF_OPTS='--unified=15' git -c interactive.singleKey=true add --patch`

I initially tried using the tree-sitter cli, python bindings and even ast-grep through various means, but this is what I ended up with.
2025-02-24 10:44:41 +01:00
Vincent Laporte 7b06fb2466 ocamlPackages_5_3.ocaml: init at 5.3.0 2025-01-09 03:02:28 +01:00
Silvan Mosberger 4f0dadbf38 treewide: format all inactive Nix files
After final improvements to the official formatter implementation,
this commit now performs the first treewide reformat of Nix files using it.
This is part of the implementation of RFC 166.

Only "inactive" files are reformatted, meaning only files that
aren't being touched by any PR with activity in the past 2 months.
This is to avoid conflicts for PRs that might soon be merged.
Later we can do a full treewide reformat to get the rest,
which should not cause as many conflicts.

A CI check has already been running for some time to ensure that new and
already-formatted files are formatted, so the files being reformatted here
should also stay formatted.

This commit was automatically created and can be verified using

    nix-build https://github.com/infinisil/treewide-nixpkgs-reformat-script/archive/a08b3a4d199c6124ac5b36a889d9099b4383463f.tar.gz \
      --argstr baseRev b32a094368
    result/bin/apply-formatting $NIXPKGS_PATH
2024-12-10 20:26:33 +01:00
Vincent Laporte ccd6676357 ocaml: 5.2.0 → 5.2.1 2024-12-02 07:37:15 +01:00
Antonio Nuno Monteiro 5020a1c82a ocaml: don't add bin-utils for darwin 2024-11-27 23:40:26 -08:00
Ulrik Strid 36bd945fc6 Add binutils to ocaml so that static compiler can build correctly (#359231) 2024-11-27 07:48:55 +01:00
Owen Lynch 52b7f0d233 added binutils to ocaml so that static compiler can build correctly 2024-11-26 09:55:09 +00:00
Reno Dakota 4becb3821e ocaml: build defaultentry not bootstrap on 5.2+
Building ocaml fails occasionally on aarch64-darwin. Using the
defaultentry target to build on ocaml 5.2 and greater may rectify this.
2024-11-06 14:48:04 +01:00
Artturin e0464e4788 treewide: replace stdenv.is with stdenv.hostPlatform.is
In preparation for the deprecation of `stdenv.isX`.

These shorthands are not conducive to cross-compilation because they
hide the platforms.

Darwin might get cross-compilation for which the continued usage of `stdenv.isDarwin` will get in the way

One example of why this is bad and especially affects compiler packages
https://www.github.com/NixOS/nixpkgs/pull/343059

There are too many files to go through manually but a treewide should
get users thinking when they see a `hostPlatform.isX` in a place where it
doesn't make sense.

```
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv.is" "stdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenv'.is" "stdenv'.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "clangStdenv.is" "clangStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "gccStdenv.is" "gccStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "stdenvNoCC.is" "stdenvNoCC.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "inherit (stdenv) is" "inherit (stdenv.hostPlatform) is"
fd --type f "\.nix" | xargs sd --fixed-strings "buildStdenv.is" "buildStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "effectiveStdenv.is" "effectiveStdenv.hostPlatform.is"
fd --type f "\.nix" | xargs sd --fixed-strings "originalStdenv.is" "originalStdenv.hostPlatform.is"
```
2024-09-25 00:04:37 +03:00
Wolfgang Walther d913a66f27 ocaml: remove left-over builder.sh
This file was last used in 3.08.0.nix removed in #114848 3 years ago.
2024-06-12 09:02:08 +02:00
Sigmanificient 203a48ad35 pkgs/development: remove unused fetchpatch arguments 2024-05-24 02:53:57 +02:00
Vincent Laporte 699ddd8f8e ocaml-ng.ocamlPackages_5_2.ocaml: 5.2.0-β2 → 5.2.0 2024-05-13 16:37:48 +02:00
Owen Lynch 8420bae610 ber_metaocaml: 111 -> 114 (#303529) 2024-04-23 10:25:37 +02:00
Vincent Laporte 439b318e01 ocaml-ng.ocamlPackages_5_2.ocaml: 5.2.0-β1 → 5.2.0-β2 2024-04-18 06:03:37 +02:00
Vincent Laporte 81feea0818 ocamlPackages_5_2.ocaml: init at 5.2.0-β1 2024-03-25 18:17:34 +01:00
Vincent Laporte c0fffa580f ocaml-ng.ocamlPackages_4_14.ocaml: 4.14.1 → 4.14.2 2024-03-15 07:15:49 +00:00
Vincent Laporte df70ab86b3 ocaml-ng.ocamlPackages_5_1.ocaml: 5.1.0 → 5.1.1 2023-12-13 09:56:13 +01:00