Commit Graph

212 Commits

Author SHA1 Message Date
Vincent Laporte
c3ef258b6f ocamlPackages.core: 0.15.0 → 0.15.1 2022-11-23 05:27:56 +01:00
Vincent Laporte
a428c94ab6 ocamlPackages.ppx_expect: 0.15.0 → 0.15.1 2022-11-23 05:27:56 +01:00
Vincent Laporte
c4c53595c4 ocamlPackages.sexplib: 0.15.0 → 0.15.1 2022-11-23 05:27:56 +01:00
José Romildo Malaquias
a3d07da456
Merge pull request #195515 from romildo/upd.ppxlib
ocamlPackages.ppxlib: 0.24.0 -> 0.28.0
2022-11-11 08:33:35 -03:00
Vincent Laporte
51e1e1ea47 ocamlPackages.base: 0.15.0 → 0.15.1 2022-11-06 15:38:05 +01:00
Vincent Laporte
5e50487731 ocamlPackages.sexplib0: 0.15.0 → 0.15.1 2022-11-06 10:37:05 +01:00
Aaron L. Zeng
1d329b1719 ocamlPackages.redis-async: init at 0.15.0 2022-10-27 10:59:20 +02:00
Aaron L. Zeng
b6b22ee21a ocamlPackages.ppx_jsonaf_conv: init at 0.15.1 2022-10-27 10:59:20 +02:00
Aaron L. Zeng
f714fa5a75 ocamlPackages.fzf: init at 0.15.0 2022-10-27 10:59:20 +02:00
Aaron L. Zeng
a55cbd74c9 ocamlPackages.file_path: init at 0.15.0 2022-10-27 10:59:20 +02:00
José Romildo
9413e94226 ocamlPackages.ppx_sexp_conv: 0.15.0 -> 0.15.1 2022-10-23 18:02:20 -03:00
Vincent Laporte
ad01127699 ocamlPackages.pythonlib: mark as broken with OCaml ≥ 4.14 2022-08-16 16:49:05 +02:00
Sandro
f68ab59f6a
Merge pull request #149718 from r-ryantm/auto-update/ocaml4.12.0-ocaml-compiler-libs
ocamlPackages.ocaml-compiler-libs: 0.12.3 -> 0.12.4
2022-07-29 16:58:50 +02:00
Vincent Laporte
fdace83aed ocamlPackages.ocaml_intrinsics: 0.15.0 → 0.15.2 2022-07-28 09:15:12 +02:00
Vincent Laporte
242001d836 patdiff: move inside ocamlPackages 2022-07-28 09:15:12 +02:00
Vincent Laporte
d97e1645ac ocamlPackages.async_smtp: require OCaml ≥ 4.12 2022-07-28 09:15:12 +02:00
Guillaume Girol
1b76f05512 ocamlPackages.ppx_css: fix eval
sedlex is already 2.5
2022-07-07 00:32:21 -04:00
Guillaume Girol
f9d0937e01 ocamlPackages.jst-config: fetch upstream patch
https://github.com/NixOS/nixpkgs/pull/166033#issuecomment-1104695149
2022-07-07 00:32:21 -04:00
Aaron L. Zeng
4f6ddfdd23 Add Jane Street ocaml packages version 0.15
- ocamlPackages.tls*: 0.15.2 -> 0.15.3
- ocamlPackages.bistro: unstable-2021-11-13 -> unstable-2022-05-07
- ocamlPackages.phylogenetics: 0.1.0 -> unstable-2022-05-06
2022-07-07 00:32:11 -04:00
Malo Bourgon
f7ef6329bb ocamlPackages: add meta.mainProgram to many packages 2022-05-14 11:31:07 +02:00
Vincent Laporte
29d63a169a ocamlPackages.js_of_ocaml: 3.11.0 → 4.0.0
ocamlPackages.incr_dom: fix for JSoO 4.0

ocamlPackages.ocsigen-toolkit: 3.1.1 → 3.2.0
2022-05-06 10:26:40 +02:00
Aaron L. Zeng
f37810ba4d ocamlPackages.core_unix: init at 0.14
This is a compatibility package for a soon-to-come breaking change in
Jane Street package layout.
2022-03-28 21:41:36 +02:00
Vincent Laporte
b5359c444e buildDunePackage: use dune_2 by default 2022-03-13 21:19:09 +01:00
Vincent Laporte
3436dfc724 ocamlPackages.pythonlib: disable for OCaml ≥ 4.13 2022-03-04 16:09:07 +01:00
Ulrik Strid
ffa377b626 ocamlPackages.base_0_12: Add dune_1 to build inputs for dune.configurator
Co-authored-by: vbgl
2022-03-04 10:04:55 +01:00
Ulrik Strid
a13cdfe520 ocamlPackages tree-wide: Move buildInputs that should be nativeBuildInputs
To keep this for the future we also strictDeps where possible, including for janePackages, topkg, oasis and ocamlbuild.
This makes some closures significantly smaller and makes cross compilation easier
2022-02-24 14:39:27 +01:00
Vincent Laporte
bb89d8d9ee ocamlPackages.core: 0.11.2 → 0.11.3 2022-02-08 18:09:46 +01:00
R. Ryantm
0f2537f7a5 ocamlPackages.ocaml-compiler-libs: 0.12.3 -> 0.12.4 2021-12-08 21:02:11 +00:00
Vincent Laporte
fb881b80f6 ocamlPackages.js_build_tools: remove at 113.33.06 2021-12-06 20:25:38 +01:00
Vincent Laporte
4263090128 ocamlPackages.buildOcamlJane: remove 2021-12-06 20:25:38 +01:00
Vincent Laporte
9f39cd801b pkgs/development/ocaml-modules/janestreet/: remove dead code 2021-12-06 20:25:38 +01:00
Vincent Laporte
c408cfdf50 ocamlPackages.variantslib: remove at 109.15.03 & 113.33.03 2021-12-06 20:25:38 +01:00
Vincent Laporte
74032d767a ocamlPackages.typerep: remove at 112.24.00 & 113.33.03 2021-12-06 20:25:38 +01:00
Vincent Laporte
efd2b3f315 ocamlPackages.fieldslib: remove at 109.20.03 & 113.33.03 2021-12-06 20:25:38 +01:00
Vincent Laporte
ec71290dc2 ocamlPackages.bin_prot: remove at 112.24.00 & 113.33.03 2021-12-06 20:25:38 +01:00
Vincent Laporte
714665cf95 ocamlPackages.pythonlib: init at 0.14.0 2021-11-16 11:53:48 +01:00
Vincent Laporte
f27f14bd7a ocamlPackages.ppx_python: init at 0.14.0 2021-11-16 11:53:48 +01:00
Vincent Laporte
c3e221c6a1
Fix evaluation after #143994 2021-11-16 00:43:14 +01:00
Felix Buehler
e601787f7e buildOcaml: rename name to pname 2021-11-01 16:19:30 +01:00
Vincent Laporte
77c929982c ocamlPackages.ppxlib: 0.22.2 → 0.23.0
ocamlPackages.ppx_variants_conv: 0.14.1 → 0.14.2

ocamlPackages.ppx_accessor: 0.14.2 → 0.14.3

ocamlPackages.accessor_core: mark as broken
2021-10-19 03:24:52 +02:00
Vincent Laporte
aef38ab3b2 ocamlPackages.ppx_js_style: 0.14.0 → 0.14.1 2021-09-16 09:51:15 +02:00
github-actions[bot]
58c8736bdb
Merge master into staging-next 2021-09-06 12:01:09 +00:00
Vincent Laporte
cdbc8c9fb1 ocamlPackages.parsexp: 0.14.0 → 0.14.1 2021-09-06 08:24:07 +02:00
Martin Weinelt
e2575c7de1
Merge branch 'master' into staging-next 2021-08-30 16:08:03 +02:00
Vincent Laporte
bf6c90bd91 ocamlPackages.ppx_optcomp: 0.14.1 → 0.14.3 2021-08-30 13:17:00 +02:00
Guillaume Girol
a17fc03375 pkgsStatic.ocaml-ng: migrate static adapter to derivations themselves 2021-08-19 09:32:03 +02:00
Vincent Laporte
8984dee07e ocamlPackages.accessor_core: mark as broken with OCaml ≥ 4.12 2021-04-27 08:42:50 +02:00
sterni
2140791f9b
ocamlPackages.janeStreet{,_0_9_0}: join the ocamlPackages fix point, allowing overriding to work as expected (#113696)
* ocamlPackages.janeStreet_0_9_0: join the ocamlPackages fix point

Internal dependencies in the janeStreet sets were always taken from the
own rec attribute set. While this is pretty simple and convenient, it
has the disadvantage that it doesn't play nice with overriding: If you'd
override an attribute in a janeStreet set previously, it would be
changed when referenced directly, but the other packages in that
janeStreet set still would use the original, non-overridden version of
the derivation.

This is easily fixed by passing janeStreet_0_9_0 itself from the fix
point of ocamlPackages and using it to reference the dependencies.

Example showing it now works as expected:

test-overlay.nix:

    self: super: {
      ocamlPackages = super.ocamlPackages.overrideScope (old: _: {
        janeStreet_0_9_0 = old.janeStreet_0_9_0 // {
          base = old.janeStreet_0_9_0.base.overrideAttrs (_: {
            meta.broken = true;
          });
        };
      });
    }

nix-repl> (import ./. {
  overlays = [ (import ./test-overlay.nix) ];
}).ocamlPackages.janeStreet_0_9_0.stdio

error: Package ‘ocaml4.10.0-base-0.9.4’ in /home/lukas/src/nix/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix:6 is marked as broken, refusing to evaluate.

a) To temporarily allow broken packages, you can use an environment variable
   for a single invocation of the nix tools.

     $ export NIXPKGS_ALLOW_BROKEN=1

b) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

* ocamlPackages.janeStreet: take part in fixpoint for OCaml >= 4.08

This change makes overrides to the janeStreet set work as expected by
making the janeStreet set take part in the ocamlPackages fixpoint for
janeStreet 0.14, i. e. OCaml >= 4.08

* ocamlPackages.janeStreet: take part in fixpoint for OCaml == 4.07

This change makes overrides to the janeStreet set work as expected by
making the janeStreet set take part in the ocamlPackages fixpoint for
janeStreet 0.12, i. e. OCaml == 4.07

* ocamlPackages.janeStreet: take part in fixpoint for OCaml < 4.07

This change makes overrides to the janeStreet set work as expected by
making the janeStreet set take part in the ocamlPackages fixpoint for
janeStreet 0.11, i. e. OCaml < 4.07

* ocamlPackages.janeStreet: remove self - super distinction

Previously, we inherited non-janestreet ocaml dependencies from super
and janestreet dependencies from self which always was super.janeStreet.

This behavior is however not really what we want due to liftJaneStreet:
Users and other packages will use ocamlPackages.base etc. instead of
ocamlPackages.janeStreet.base and the like. Consequently they also would
override the top-level attributes which would mean that other janestreet
packages would not pick up on it however.

As a consequence however, overriding ocamlPackages.janeStreet.base
doesn't work. Since this was never possible, I don't think this is an
issue. It is probably a good idea to deprecate that set anyways and
printing a warning when it is used via trace.

janeStreet_0_9_0 is unchanged as the disticniton between self and super
makes sense for it.

Below is an example showing how overriding would work from an user's
perspective:

test-overlay.nix:

    self: super: {
      ocamlPackages = super.ocamlPackages.overrideScope (old: _: {
        base = old.base.overrideAttrs (_: {
          meta.broken = true;
        });
      });
    }

nix-repl> (import ./. { overlays = [ (import ./test-overlay.nix) ]; }).ocamlPackages.
stdio
error: Package ‘ocaml4.10.0-base-0.14.0’ in /home/lukas/src/nix/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix:12 is marked as broken, refusing to evaluate.

a) To temporarily allow broken packages, you can use an environment variable
   for a single invocation of the nix tools.

     $ export NIXPKGS_ALLOW_BROKEN=1

b) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.
2021-04-11 12:26:10 +02:00
Vincent Laporte
92a1b57bb1 ocamlPackages.ppxlib: default to 0.22.0
ocamlPackages.base_quickcheck 0.14.0 → 0.14.1

ocamlPackages.ppx_custom_printf: 0.14.0 → 0.14.1

ocamlPackages.ppx_expect: 0.14.0 → 0.14.1

ocamlPackages.ppx_optcomp: 0.14.0 → 0.14.1

ocamlPackages.ppx_sexp_conv: 0.14.1 → 0.14.3

ocamlPackages.ppx_sexp_message: 0.14.1 → 0.14.2

ocamlPackages.ppx_typerep_conv: 0.14.1 → 0.14.2

ocamlPackages.visitors: 20210127 → 20210316

ocamlPackages.pgocaml: 4.2.2 → 4.2.2-dev-20210111
2021-03-25 17:36:51 +01:00
Vincent Laporte
d0cb67f669 ocamlPackages.core: 0.14.0 → 0.14.1 2021-03-16 08:18:56 +01:00