Commit Graph

2353 Commits

Author SHA1 Message Date
Mario Rodas
53a3fc2856 ocamlPackages.sedlex_2: 2.2 -> 2.3 2021-04-24 17:04:32 +02:00
sternenseemann
31014c4a28 ocamlPackages.mirage-crypto*: 0.9.2 -> 0.10.0
https://github.com/mirage/mirage-crypto/releases/tag/v0.10.0
2021-04-24 09:56:10 +02:00
sternenseemann
fb8c527586 ocamlPackages.irmin: 2.5.2 -> 2.5.3
https://github.com/mirage/irmin/releases/tag/2.5.3
2021-04-21 22:32:06 +02:00
Vincent Laporte
1f1a77bdb7 ocamlPackages.labltk: fix ocamlbrowser by wrapping
Also remove legacy versions
2021-04-21 13:56:54 +02:00
Vincent Laporte
d2caa11ce0 ocamlPackages.earlybird: 0.1.5 → 1.1.0 2021-04-19 22:12:38 +02:00
Vincent Laporte
95341f082c ocamlPackages.path_glob: init at 0.2 2021-04-19 22:12:38 +02:00
Vincent Laporte
cdff996ed3 ocamlPackages.dap: init at 1.0.6 2021-04-19 22:12:38 +02:00
sternenseemann
5252b4bd1b ocamlPackages.ocaml_extlib-1-7-7: init at 1.7.7
Unfortunately there's no way to get Haxe 4.0 and 4.1 to work with extlib
1.7.8 (not even without the minimal install), so we need to package
1.7.7 again, at least until 1.7.9 (?) brings backwards compatibility
packages, hopefully.
2021-04-19 14:42:42 +02:00
Ulrik
1a2c0d2213 ocamlPackages.x509: 0.11.2 -> 0.12.0
Adds support for EC DSA from mirage-crypto

Co-authored-by: Vincent Laporte <vbgl@users.noreply.github.com>
2021-04-18 21:07:26 +02:00
Enrico Tassi
5594aa424c elpi: 1.13.0 -> 1.13.1 2021-04-18 06:09:28 +02:00
Pavol Rusnak
29bb19258a
treewide: use https for github URIs 2021-04-17 17:59:08 +02:00
Vincent Laporte
8db8975228 ocamlPackages.ezxmlm: 1.0.2 → 1.1.0 2021-04-17 13:17:07 +02:00
Vincent Laporte
982bdad584 ocamlPackages.cairo2: use Dune 2 2021-04-16 11:07:36 +02:00
Vincent Laporte
e3aa8c650b ocamlPackages.lablgtk3: use Dune 2 2021-04-16 11:07:36 +02:00
sternenseemann
894b606945 ocamlPackages.wayland: init at 0.2 2021-04-15 11:51:06 +02:00
Vincent Laporte
fd75d3b722 ocamlPackages.safepass: 3.0 → 3.1 2021-04-15 07:04:35 +02:00
Vincent Laporte
1c6935fbe4 ocamlPackages.postgresql: 4.6.3 → 5.0.0 2021-04-14 22:39:03 +02:00
Vincent Laporte
7db1853f5c ocamlPackages.rpclib: 8.0.0 → 8.1.0 2021-04-12 21:37:58 +02:00
Vincent Laporte
f01a04abd4
ocamlPackages.jsonrpc: 1.4.1 → 1.5.0 2021-04-12 08:22:24 +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
0062afc050 ocamlPackages.printbox: 0.4 → 0.5 2021-04-11 10:10:38 +02:00
sternenseemann
f0ceaf880e ocamlPackages.mirage-crypto*: 0.9.1 -> 0.9.2
https://github.com/mirage/mirage-crypto/releases/tag/v0.9.2
2021-04-09 14:23:12 +02:00
sternenseemann
4462a1f678 ocamlPackages.irmin*: 2.5.1 -> 2.5.2
https://github.com/mirage/irmin/releases/tag/2.5.2
2021-04-09 07:57:04 +02:00
Vincent Laporte
cf42b2eb0f
ocamlPackages.sqlite3: use Dune 2 2021-04-07 21:27:13 +02:00
Vincent Laporte
cc6d25b0d3 ocamlPackages.merlin-extend: use Dune 2 2021-04-07 20:34:26 +02:00
Vincent Laporte
55ddc94d92 ocamlPackages.ocamlnet: 4.1.8 → 4.1.9 2021-04-07 20:32:28 +02:00
Vincent Laporte
c86f67bfb9 ocamlPackages.minisat: 0.2 → 0.3 2021-04-06 08:43:38 +02:00
Vincent Laporte
026b9db487
ocamlPackages.opti: use Dune 2 2021-04-05 17:19:44 +02:00
Vincent Laporte
938741a71b
ocamlPackages.parmap: use Dune 2 2021-04-05 16:50:15 +02:00
Vincent Laporte
3eb054abd8
ocamlPackages.gnuplot: use Dune 2 2021-04-05 15:14:40 +02:00
sternenseemann
83eb1fe06d ocamlPackages.pbkdf: init at 1.1.0
Necessary for the upcoming x509 0.12.0 release.
2021-04-05 15:09:05 +02:00
sternenseemann
60fa97197d ocamlPackages.mirage-crypto: 0.9.0 -> 0.9.1 2021-04-05 14:59:36 +02:00
sternenseemann
4350ede15e ocamlPackages.mimic: 0.0.1 -> 0.0.2
https://github.com/mirage/ocaml-git/releases/tag/mimic-v0.0.2
2021-04-05 14:27:57 +02:00
sternenseemann
2f368c2060 ocamlPackages.decompress-1-2: remove at 1.2.0
With imagelib updated there remains no user of this in nixpkgs.
2021-04-02 15:03:44 +02:00
sternenseemann
a6425a6008 ocamlPackages.imagelib: 20200929 -> 20210402
Allows us to get rid of decompress 1.2.0:

https://github.com/rlepigre/ocaml-imagelib/releases/tag/20210402
2021-04-02 15:03:44 +02:00
Vincent Laporte
170bad5b0a
ocamlPackages.gsl: use Dune 2 2021-04-02 14:12:12 +02:00
Vincent Laporte
9ac5c7df17 ocamlPackages.gettext-camomile: init at 0.4.2 2021-04-02 09:13:44 +02:00
Vincent Laporte
ef0e64ec60
ocamlPackages.sosa: remove spurious dependency on nonstd 2021-04-02 09:01:22 +02:00
sternenseemann
77ffcfa47a ocamlPackages.mirage-crypto*: 0.8.10 -> 0.9.0
ocamlPackages.mirage-crypto: allow compiling with ocaml-freestanding

ocamlPackages.mirage-crypto-ec: init at 0.9.0

https://github.com/mirage/mirage-crypto/releases/tag/v0.9.0
2021-04-01 22:14:30 +02:00
sternenseemann
83820fe6db ocamlPackages.mirage-clock-freestanding: init at 3.1.0 2021-04-01 16:10:15 +02:00
Vincent Laporte
94837b564d
ocamlPackages.crowbar: use Dune 2 2021-04-01 09:37:32 +02:00
Vincent Laporte
595363a38f
ocamlPackages.dtoa: use Dune 2 2021-04-01 09:08:13 +02:00
Vincent Laporte
dc68bad367
ocamlPackages.cpu: use Dune 2 2021-04-01 08:49:17 +02:00
Vincent Laporte
6373ef78c6
ocamlPackages.parany: use Dune 2 2021-04-01 08:46:19 +02:00
Vincent Laporte
086ae4a06d ocamlPackages.bigstring: 0.2 → 0.3 2021-04-01 08:33:08 +02:00
Vincent Laporte
d99c24d00a ocamlPackages.hidapi: use Dune 2 2021-04-01 08:33:08 +02:00
sternenseemann
7c9de65429 ocamlPackages.tcpip: 6.0.0 -> 6.1.0
https://github.com/mirage/mirage-tcpip/releases/tag/v6.1.0
2021-03-30 08:57:29 +02:00
sternenseemann
3ec81e0849 ocaml-freestanding: propagate solo5
solo5's bindings and ocaml-freestanding are both statically linked and
thus packages depending on ocaml-freestanding need the solo5 bindings as
well.
2021-03-30 08:57:29 +02:00
Vincent Laporte
1b21d00de8
ocamlPackages.spacetime_lib: use Dune 2 2021-03-30 08:32:05 +02:00
Vincent Laporte
25a75128d3
ocamlPackages.spelll: use Dune 2 2021-03-29 22:05:45 +02:00