Commit graph

682 commits

Author SHA1 Message Date
superherointj ff17ccefee ocamlPackages.tls-async: init 0.13.2 2021-06-18 12:44:54 +02:00
superherointj 930ccdeade ocamlPackages.cstruct-async: init 6.0.0 2021-06-17 11:46:23 +02:00
superherointj 2efd63b87c ocamlPackages.reason-native: init 2020-07-18-a33f152
Adds 10 Reason Native packages:
    * reason-native-console
    * reason-native-dir
    * reason-native-file-context-printer
    * reason-native-fp
    * reason-native-pastel
    * reason-native-pastel-console
    * reason-native-qcheck-rely
    * reason-native-refmterr
    * reason-native-rely
    * reason-native-rely-junit-reporter
2021-06-16 17:47:58 +02:00
Vincent Laporte 0ae4fd5bc3 ocamlPackages.cstruct: remove at 1.9.0 for OCaml < 4.02
This removes unreachable code.
2021-06-14 08:26:11 +02:00
superherointj fdc3bf4178 ocamlPackages.mccs: init 1.1+13 2021-06-14 04:37:07 +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 d930bfd5fa ocamlPackages.cudf: init 0.9 2021-06-10 23:47:12 +02:00
superherointj 3912cf9371
ocamlPackages.bz2: init at 0.7.0
Closes #126469
2021-06-10 16:23:06 +02:00
fortuneteller2k 4a34590ece ocamlPackages.cooltt: init at unstable-2021-05-25 2021-06-06 06:30:03 +02:00
Vincent Laporte 5ca9831cb1 ocamlPackages.menhir: 20190626 → 20210419
ocamlPackages.menhirLib: init at 20210419
ocamlPackages.menhirSdk: init at 20210419
2021-06-05 13:38:01 +02:00
Vincent Laporte 759d05ce9e ocamlPackages.stdcompat: init at 15 2021-06-05 13:38:01 +02:00
Vincent Laporte fdeeb2630b ocamlPackages.ppx_import: disable checks 2021-06-04 04:51:38 +02:00
superherointj 60f5a3c18d ocamlPackages.junit: init 2.0.2
ocamlPackages.junit_ounit: init 2.0.2
ocamlPackages.junit_alcotest: init 2.0.2
2021-06-02 18:13:07 +02:00
sternenseemann 2d3225a6c2 ocamlPackages.bap: fix for multiple outputs llvmPackages
7869d16545 split all packages in
llvmPackages into multiple outputs. The default output of llvm doesn't
contain llvm-config, so we need to explicitly choose llvm.dev here.
2021-05-18 01:44:31 +02:00
github-actions[bot] 10e16ec9ab
Merge master into staging-next 2021-05-11 06:20:33 +00:00
sterni f93d83d21b
ocamlPackages: cohttp: 2.5.0 -> 4.0.0; conduit: 2.2.2 -> 4.0.0 (#118144)
* ocamlPackages.x509: 0.12.0 -> 0.13.0

https://github.com/mirleft/ocaml-x509/releases/tag/v0.13.0

* ocamlPackages.tls{,-mirage}: 0.12.8 -> 0.13.1

https://github.com/mirleft/ocaml-tls/releases/tag/v0.13.0
https://github.com/mirleft/ocaml-tls/releases/tag/v0.13.1

* ocamlPackages.ca-certs: 0.2.0 -> 0.2.1

Adds support for NIX_SSL_CERT_FILE, so we can finally run its test
suite! https://github.com/mirage/ca-certs/releases/tag/v0.2.1

* ocamlPackages.dns*: 4.6.3 -> 5.0.0

* jackline: unstable-2020-09-03 -> unstable-2021-04-23

Compatibility with tls >= 0.13.0

* ocamlPackages.ca-certs-nss: init at 3.64.0.1

* ocamlPackages.conduit: 2.2.2 -> 2.3.0

https://github.com/mirage/ocaml-conduit/releases/tag/v2.3.0

* ocamlPackages.curly: fix tests with new ca-certs behavior

* ocamlPackages.cohttp: 2.5.0 -> 4.0.0

ocamlPackages.cohttp-lwt-unix: add description

https://github.com/mirage/ocaml-cohttp/releases/tag/v4.0.0

* ocamlPackages.mirage{,-runtime,-types*}: 3.10.1 -> 3.10.3

Adjust to a few changed dependencies:
https://github.com/mirage/mirage/releases/tag/v3.10.2
https://github.com/mirage/mirage/releases/tag/v3.10.3

* ocamlPackages.conduit*: 2.3.0 -> 4.0.0

https://github.com/mirage/ocaml-conduit/releases/tag/v4.0.0

* ocamlPackages.cohttp-lwt-unix: disable tests

* ocamlPackages.dns*: 5.0.0 -> 5.0.1

https://github.com/mirage/ocaml-dns/releases/tag/v5.0.1

* ocamlPackages.awa*: 0.0.1 -> 0.0.3

https://github.com/mirage/awa-ssh/releases/tag/v0.0.2
https://github.com/mirage/awa-ssh/releases/tag/v0.0.3

* ocamlPackages.optint: 0.0.4 -> 0.1.0

https://github.com/mirage/optint/releases/tag/v0.0.5
https://github.com/mirage/optint/releases/tag/v0.1.0

* ocamlPackages.decompress: 1.3.0 -> 1.4.0

https://github.com/mirage/decompress/releases/tag/v1.4.0

* ocamlPackages.checkseum: 0.2.1 -> 0.3.1

https://github.com/mirage/checkseum/releases/tag/v0.3.0
https://github.com/mirage/checkseum/releases/tag/v0.3.1

* ocamlPackages.checkseum: allow compilation with ocaml-freestanding

* ocamlPackages.carton: 0.4.0 -> 0.4.1

https://github.com/mirage/ocaml-git/releases/tag/carton-v0.4.1

* ocamlPackages.mimic: 0.0.2 -> 0.0.3

* Upstream changed.
* https://github.com/dinosaure/mimic/releases/tag/0.0.3

* ocamlPackages.letsencrypt: 0.2.4 -> 0.2.5

* ocamlPackages.paf: 0.0.1 -> 0.0.3

* ocamlPackages.git-cohttp-mirage: remove at 3.3.3

Will be replaced by git-paf 3.4.0.

* ocamlPackages.git*: 3.3.3 -> 3.4.0

ocamlPackages.git-paf: init at 3.4.0

https://github.com/mirage/ocaml-git/releases/tag/3.4.0

* ocamlPackages.irmin*: 2.5.3 -> 2.6.0

https://github.com/mirage/irmin/releases/tag/2.6.0
2021-05-11 06:54:15 +02:00
github-actions[bot] 0e4580d4d0
Merge staging-next into staging 2021-05-02 18:24:58 +00:00
José Romildo Malaquias bc33b23cd0 ppx_deriving_cmdliner: init at 0.6.0 2021-05-02 14:52:52 +02:00
Andrew Childs 7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
github-actions[bot] c01456266d
Merge staging-next into staging 2021-04-27 12:07:01 +00:00
Vincent Laporte 1a47b8fe6f OCaml: default to version 4.12 2021-04-27 08:42:50 +02:00
Vincent Laporte 8984dee07e ocamlPackages.accessor_core: mark as broken with OCaml ≥ 4.12 2021-04-27 08:42:50 +02:00
github-actions[bot] f0290a5d27
Merge staging-next into staging 2021-04-26 18:14:28 +00:00
sternenseemann 5955013253 ocamlPackages.paf: init at 0.0.1 2021-04-26 15:23:08 +02:00
sternenseemann 6c95bce8b6 ocamlPackages.letsencrypt: init at 0.2.4 2021-04-26 15:23:08 +02:00
github-actions[bot] e30742adc3
Merge staging-next into staging 2021-04-26 12:06:35 +00:00
sternenseemann f4c229058d ocamlPackages.h2: init at 0.8.0 2021-04-26 08:31:53 +02:00
sternenseemann 4d53880408 ocamlPackages.hpack: init at 0.8.0 2021-04-26 08:31:53 +02:00
github-actions[bot] 9a945aac72
Merge staging-next into staging 2021-04-25 18:14:18 +00:00
sternenseemann 4f7a6610f7 ocamlPackages.mirage-bootvar-xen: init at 0.8.0 2021-04-25 13:15:10 +02:00
sternenseemann 2fe8239172 ocamlPackages.{mirage-net-xen,netchannel}: init at 2.0.0 2021-04-25 13:15:10 +02:00
sternenseemann 980a2bed3b ocamlPackages.mirage-xen: init at 6.0.0
Unfortunately this requires a bit of trickery with pkg-config to get to
work. The root issue is that the mirage-xen assumes that we use the
default libdir of dune ($out/lib) whereas we install to an OCaml
version-specific site-lib directory. Thus the manually created
pkg-config file makes wrong assumptions (which warrants a patch) and the
.pc file is installed to the wrong location (which is fixed with a mv
invocation).
2021-04-25 13:13:23 +02:00
sternenseemann b5f7ed7cc8 ocamlPackages.shared-memory-ring(-lwt): init at 3.1.0 2021-04-25 13:08:25 +02:00
github-actions[bot] 5fe3cbef9a
Merge staging-next into staging 2021-04-20 00:15:41 +00: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
github-actions[bot] ea5bd4364e
Merge staging-next into staging 2021-04-19 18:11:54 +00: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
Jörg Thalheim b2a1e04eed
Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-04-17 16:37:04 +02:00
Alyssa Ross 70e33e3ae3 glsurf: use current giflib
This requires bumping the version of camlimages used by glsurf to a
version that supports current giflib.  The most recent versions of
camlimages (even of 4.x) don't support ocaml 4.01 any more, so I've
upgraded to 4.1.2 here, the last version that supports ocaml 4.01 (and
which happily supports current giflib).
2021-04-16 14:06:10 +00:00
sternenseemann 894b606945 ocamlPackages.wayland: init at 0.2 2021-04-15 11:51:06 +02:00
Vincent Laporte 7db1853f5c ocamlPackages.rpclib: 8.0.0 → 8.1.0 2021-04-12 21:37:58 +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
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 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 9ac5c7df17 ocamlPackages.gettext-camomile: init at 0.4.2 2021-04-02 09:13:44 +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
sternenseemann ef6450411f ocamlPackages_4_{11,12}: merlin: 3.4.2 -> 4.1
Add nix expression for the OCaml-version specific versions of merlin
4.1 and conditionally call it in ocaml-packages.nix.
2021-03-27 17:26:12 +01:00