diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-29 06:01:13 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-29 06:01:13 +0000 |
| commit | 36f70c96379856a37de23a7ffa51eac40f12706e (patch) | |
| tree | 08f112e1e5dd1afddab50761ffd33cbb286ddfdc /pkgs/top-level | |
| parent | 4fc7a31edb195d666c4e782c56cd5ad32f8ab3bc (diff) | |
| parent | 6a3b465b39238f8d12cb2dedd5e418023936d5f3 (diff) | |
| download | nixpkgs-36f70c96379856a37de23a7ffa51eac40f12706e.tar nixpkgs-36f70c96379856a37de23a7ffa51eac40f12706e.tar.gz nixpkgs-36f70c96379856a37de23a7ffa51eac40f12706e.tar.bz2 nixpkgs-36f70c96379856a37de23a7ffa51eac40f12706e.tar.lz nixpkgs-36f70c96379856a37de23a7ffa51eac40f12706e.tar.xz nixpkgs-36f70c96379856a37de23a7ffa51eac40f12706e.tar.zst nixpkgs-36f70c96379856a37de23a7ffa51eac40f12706e.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 61ae320e077..4e2f06ceb99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11947,7 +11947,8 @@ in ocamlformat # latest version ocamlformat_0_11_0 ocamlformat_0_12 ocamlformat_0_13_0 ocamlformat_0_14_0 ocamlformat_0_14_1 ocamlformat_0_14_2 ocamlformat_0_14_3 ocamlformat_0_15_0 - ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0; + ocamlformat_0_15_1 ocamlformat_0_16_0 ocamlformat_0_17_0 ocamlformat_0_18_0 + ocamlformat_0_19_0; orc = callPackage ../development/compilers/orc { }; @@ -17553,7 +17554,7 @@ in mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; - mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { + mkvtoolnix-cli = mkvtoolnix.override { withGUI = false; }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8eb8a3944f9..776f9134bca 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -934,6 +934,8 @@ let odoc = callPackage ../development/ocaml-modules/odoc { }; + odoc-parser = callPackage ../development/ocaml-modules/odoc-parser { }; + omd = callPackage ../development/ocaml-modules/omd { }; opam-core = callPackage ../development/ocaml-modules/opam-core { |