diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-03-14 00:02:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-14 00:02:12 +0000 |
| commit | ea64a128d1ed70c40ce897d0d8cc569e2eb394cd (patch) | |
| tree | 7c100fb9a45eeffc2013e0edac4287f3533f3110 /pkgs/top-level | |
| parent | 38910351b753e23a1731fd95fa99765d3a21dcc5 (diff) | |
| parent | 1073633d8914364109bf453af7bed0aa06e5f5bf (diff) | |
| download | nixlib-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar nixlib-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.gz nixlib-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.bz2 nixlib-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.lz nixlib-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.xz nixlib-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.tar.zst nixlib-ea64a128d1ed70c40ce897d0d8cc569e2eb394cd.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index c883066ced52..cc126dc320de 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1580,6 +1580,8 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_13 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.13.nix { }); + ocamlPackages_4_14 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.14.nix { }); + ocamlPackages_latest = ocamlPackages_4_13; ocamlPackages = ocamlPackages_4_13; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 81628686a315..1da6e934c24b 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -144,6 +144,8 @@ lib.makeScope pkgs.newScope (self: with self; { phing = callPackage ../development/php-packages/phing { }; + phive = callPackage ../development/php-packages/phive { }; + php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { }; php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { }; |