Commit Graph

753 Commits

Author SHA1 Message Date
Mario Rodas
2becf6e837 maintainers: drop marsam 2024-04-24 04:20:00 +00:00
Mario Rodas
e421acb18a dune_3: 3.15.1 -> 3.15.2
Diff: https://github.com/ocaml/dune/compare/3.15.1...3.15.2

Changelog: https://github.com/ocaml/dune/raw/3.15.2/CHANGES.md
2024-04-23 21:35:59 +02:00
Mario Rodas
484fa31a40
dune_3: 3.15.0 -> 3.15.1 (#304968)
* dune_3: 3.15.0 -> 3.15.1

Diff: https://github.com/ocaml/dune/compare/3.15.0...3.15.1

Changelog: https://github.com/ocaml/dune/raw/3.15.1/CHANGES.md

* ocamlPackages.ocaml-protoc-plugin: mark as broken
2024-04-21 21:34:12 +02:00
Mario Rodas
4b6f17a8a6 dune_3: 3.14.2 -> 3.15.0
Diff: https://github.com/ocaml/dune/compare/3.14.2...3.15.0

Changelog: https://github.com/ocaml/dune/raw/3.15.0/CHANGES.md
2024-04-15 06:38:33 +02:00
Philip Taron
9df9593b0c Avoid top-level with ...; in pkgs/development/tools/ocaml/ocaml-top/default.nix 2024-03-26 16:41:24 +01:00
Philip Taron
6938c6ae78 Avoid top-level with ...; in pkgs/development/tools/ocaml/opam-publish/default.nix 2024-03-26 16:41:24 +01:00
R. Ryantm
8898f511ba ocamlPackages.js_of_ocaml: 5.6.0 -> 5.7.1 2024-03-25 06:12:40 +01:00
Martin Weinelt
3321e63b12
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
- pkgs/development/python-modules/sphinx-autobuild/default.nix
2024-03-19 04:00:32 +01:00
stuebinm
ff1a94e523 treewide: add meta.mainProgram to packages with a single binary
The nixpkgs-unstable channel's programs.sqlite was used to identify
packages producing exactly one binary, and these automatically added
to their package definitions wherever possible.
2024-03-19 03:14:51 +01:00
github-actions[bot]
9da92f31f4
Merge master into staging-next 2024-03-15 12:01:07 +00:00
Vincent Laporte
c0fffa580f
ocaml-ng.ocamlPackages_4_14.ocaml: 4.14.1 → 4.14.2 2024-03-15 07:15:49 +00:00
github-actions[bot]
cecf050e96
Merge master into staging-next 2024-03-13 12:01:25 +00:00
Mario Rodas
ff9cb2dc9e dune_3: 3.14.0 -> 3.14.2
Diff: https://github.com/ocaml/dune/compare/3.14.0...3.14.2

Changelog: https://github.com/ocaml/dune/raw/3.14.2/CHANGES.md
2024-03-13 12:00:25 +01:00
a-n-n-a-l-e-e
ce789e7e35
llvmPackages_{12,13,14,15,16,17,git}.{libcxx,libcxxabi}: merge libcxxabi into libcxx (#292043)
- merge libcxxabi into libcxx for LLVM 12, 13, 14, 15, 16, 17, and git.
- remove the link time workaround `-lc++ -lc++abi` from 58 packages as it is no longer required.
- fixes https://github.com/NixOS/nixpkgs/issues/166205
- provides alternative fixes for. https://github.com/NixOS/nixpkgs/issues/269548 https://github.com/NixOS/nix/issues/9640
- pkgsCross.x86_64-freebsd builds work again

This change can be represented in 3 stages
1. merge libcxxabi into libcxx -- files: pkgs/development/compilers/llvm/[12, git]/{libcxx, libcxxabi}
2. update stdenv to account for merge -- files: stdenv.{adapters, cc.wrapper, darwin}
3. remove all references to libcxxabi outside of llvm (about 58 packages modified)

### merging libcxxabi into libcxx
- take the union of the libcxxabi and libcxx cmake flags
- eliminate the libcxx-headers-only package - it was only needed to break libcxx <-> libcxxabi circular dependency
- libcxx.cxxabi is removed. external cxxabi (freebsd) will symlink headers / libs into libcxx.
- darwin will re-export the libcxxabi symbols into libcxx so linking `-lc++` is sufficient.
- linux/freebsd `libc++.so` is a linker script `LINK(libc++.so.1, -lc++abi)` making `-lc++` sufficient.
- libcxx/default.nix [12, 17] are identical except for patches and `LIBCXX_ADDITIONAL_LIBRARIES` (only used in 16+)
- git/libcxx/defaul.nix  does not link with -nostdlib when useLLVM is true so flag is removed. this is not much different than before as libcxxabi used -nostdlib where libcxx did not, so libc was linked in anyway.

### stdenv changes
- darwin bootstrap, remove references to libcxxabi and cxxabi
- cc-wrapper: remove c++ link workaround when libcxx.cxxabi doesn't exist (still exists for LLVM pre 12)
- adapter: update overrideLibcxx to account for a pkgs.stdenv that only has libcxx

### 58 package updates
- remove `NIX_LDFLAGS = "-l${stdenv.cc.libcxx.cxxabi.libName}` as no longer needed
- swift, nodejs_v8 remove libcxxabi references in the clang override

https://github.com/NixOS/nixpkgs/pull/292043
2024-03-11 03:53:37 -07:00
R. Ryantm
7350e1c973 ocamlPackages.utop: 2.13.1 -> 2.14.0 2024-02-26 21:40:53 +00:00
Jules Aguillon
fb561a248d ocamlPackages.merlin: 4.13 → 4.14
This phases out versions 4.12, 4.13 and 4.13.1. Version 4.14 supporting
a wider range of OCaml versions.
2024-02-23 15:20:34 +01:00
Mario Rodas
58a5225e39
dune_3: 3.13.1 -> 3.14.0 (#288510)
* dune_3: 3.13.1 -> 3.14.0

Diff: https://github.com/ocaml/dune/compare/3.13.1...3.14.0

Changelog: https://github.com/ocaml/dune/raw/3.14.0/CHANGES.md

* dune-release: fix tests for dune 3.14

* dune_3: add dune-release as reverse dependency to passthru.tests
2024-02-14 07:10:50 +01:00
Vincent Laporte
b8ab93f74a
ocamlPackages.dune_3: 3.13.0 → 3.13.1 2024-02-06 07:38:51 +01:00
Mario Rodas
47b64d03d1 dune_3: 3.12.2 -> 3.13.0
Diff: https://github.com/ocaml/dune/compare/3.12.2...3.13.0

Changelog: https://github.com/ocaml/dune/raw/3.13.0/CHANGES.md
2024-01-17 14:55:06 +01:00
R. Ryantm
d6e9e26d23 ocamlPackages.js_of_ocaml: 5.5.2 -> 5.6.0 2024-01-15 10:37:21 +01:00
Mario Rodas
d318a6b275
Merge pull request #279077 from r-ryantm/auto-update/dune_3
dune_3: 3.12.1 -> 3.12.2
2024-01-14 07:09:04 -05:00
R. Ryantm
f6c220abd4 ocamlPackages.ocamlbuild: 0.14.2 -> 0.14.3 2024-01-06 09:16:05 +01:00
R. Ryantm
ce2410cf0c dune_3: 3.12.1 -> 3.12.2 2024-01-06 05:22:46 +00:00
R. Ryantm
a8cdcb9427 ocamlPackages.js_of_ocaml: 5.4.0 -> 5.5.2 2024-01-02 08:27:06 +01:00
Mario Rodas
e22d6561dc
Merge pull request #271551 from marsam/fix-darwin-opam
opam: fix build on darwin

Fixes https://github.com/NixOS/nixpkgs/issues/274120
2023-12-16 13:58:02 -05:00
Vincent Laporte
df70ab86b3 ocaml-ng.ocamlPackages_5_1.ocaml: 5.1.0 → 5.1.1 2023-12-13 09:56:13 +01:00
Jules Aguillon
7cb40bcdcc ocamlPackages.merlin: Drop unused source hashes
The set of required source versions is now explicit, unused versions can
be removed without fears.
2023-12-01 17:54:43 +01:00
Jules Aguillon
0ee8802f85 ocamlPackages.merlin: 4.12 → 4.13
The range of supported versions of OCaml for each versions of Merlin is
no longer monotonic and can't be expressed with `lib.versionAtLeast`
easily.
The latest version of Merlin is now explicitly mapped for each version
of OCaml.
2023-12-01 17:51:10 +01:00
Mario Rodas
ffa8947f4a opam: fix build on darwin 2023-11-30 04:20:00 +00:00
Mario Rodas
2c01cd06af dune_3: 3.12.0 -> 3.12.1
Diff: https://github.com/ocaml/dune/compare/3.12.0...3.12.1

Changelog: https://github.com/ocaml/dune/blob/3.12.1/CHANGES.md
2023-11-29 20:53:53 +01:00
Mario Rodas
6007641aff dune_3: 3.11.1 -> 3.12.0
Diff: https://github.com/ocaml/dune/compare/None...3.12.0

Changelog: https://github.com/ocaml/dune/raw/3.12.0/CHANGES.md
2023-11-29 10:54:08 +01:00
Emily Trau
b17ee3b735
Merge pull request #264680 from r-ryantm/auto-update/opam-publish
opam-publish: 2.2.0 -> 2.3.0
2023-11-29 18:16:30 +11:00
Henry Till
7ff193305b treewide: remove henrytill as maintainer from various pkgs 2023-11-28 10:52:47 -08:00
Vincent Laporte
97e9d370d7 obuild: 0.1.10 → 0.1.11 2023-11-28 06:07:37 +01:00
Vincent Laporte
c60d7e0c77 ocamlPackages.camlp5: 8.00.05 → 8.02.1 2023-11-20 07:03:45 +01:00
Vincent Laporte
e5b8794184 ocamlPackages.camlidl: 1.11 → 1.12 2023-11-16 05:52:57 +01:00
Vincent Laporte
e1ccd228a1 ocamlPackages.ocamlify: disable for OCaml ≥ 5.0 2023-11-07 04:50:31 +01:00
Vincent Laporte
2157c909d2 ocamlPackages.ocp-build: disable for OCaml ≥ 5.0 2023-11-07 04:50:31 +01:00
Vincent Laporte
573366e267 ocaml-top: remove unused dependencies 2023-11-07 04:50:31 +01:00
R. Ryantm
094eb77f32 opam-publish: 2.2.0 -> 2.3.0 2023-10-31 22:15:57 +00:00
Mario Rodas
08a8f7903d
Merge pull request #259975 from Alizter/ps/branch/dune_3__3_11_0____3_11_1
dune_3: 3.11.0 -> 3.11.1
2023-10-12 08:52:51 -05:00
Ali Caglayan
c297d40ad3
dune_3: 3.11.0 -> 3.11.1
Signed-off-by: Ali Caglayan <alizter@gmail.com>
2023-10-09 12:14:29 +01:00
Vincent Laporte
e0b78ab95b ocamlPackages.ocp-index: 1.3.4 → 1.3.5 2023-10-04 14:03:05 +02:00
Jules Aguillon
ce860f6a1e ocamlPackages.merlin: 4.10 → 4.12 2023-09-27 14:49:44 +02:00
Jules Aguillon
91ab8ed21d ocamlPackages.merlin: Fix OCaml version shortening
The previous method was incompatible with future Merlin versions.
2023-09-27 14:49:44 +02:00
Ali Caglayan
f2f45aa937
dune_3: 3.10.0 -> 3.11.0
Signed-off-by: Ali Caglayan <alizter@gmail.com>
2023-09-22 17:50:58 +01:00
Niols
3b49077fbe ocamlPackages.opam-publish: init at 2.2.0 2023-09-21 10:57:54 +02:00
Mario Rodas
905323a083 ocaml-ng.ocamlPackages_4_14.merlin,ocaml-ng.ocamlPackages_5_0.merlin: 4.9 -> 4.10
Changelog:
- https://github.com/ocaml/merlin/releases/tag/v4.10-414
- https://github.com/ocaml/merlin/releases/tag/v4.10-500
2023-08-30 04:20:00 +00:00
Vincent Laporte
409d682a57 coqPackages_8_14.coq-elpi: fix by using old camlp5 2023-08-28 07:36:16 +02:00
Vincent Laporte
032f6c6f93 ocamlPackages.camlp5: 7.14 → 8.00.05 2023-08-11 19:10:36 +02:00