diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2021-07-26 12:40:04 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2021-07-26 12:40:04 +0200 |
| commit | 18347a1caf7d3347a937c9d8fc0a0be0df6dc292 (patch) | |
| tree | 53df6789bdf52052cd09a5bbcfc68b06c634e581 /pkgs/top-level | |
| parent | 672a6a6db10c0064ab3fd003af55a6b5b846dc55 (diff) | |
| parent | d44743615c7d3ef3cb9a72e6a62b6c3ec0573111 (diff) | |
| download | nixpkgs-18347a1caf7d3347a937c9d8fc0a0be0df6dc292.tar nixpkgs-18347a1caf7d3347a937c9d8fc0a0be0df6dc292.tar.gz nixpkgs-18347a1caf7d3347a937c9d8fc0a0be0df6dc292.tar.bz2 nixpkgs-18347a1caf7d3347a937c9d8fc0a0be0df6dc292.tar.lz nixpkgs-18347a1caf7d3347a937c9d8fc0a0be0df6dc292.tar.xz nixpkgs-18347a1caf7d3347a937c9d8fc0a0be0df6dc292.tar.zst nixpkgs-18347a1caf7d3347a937c9d8fc0a0be0df6dc292.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/ocaml-packages.nix | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b794003130..94095dfa713 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1337,6 +1337,8 @@ in bisq-desktop = callPackage ../applications/blockchains/bisq-desktop { }; + bic = callPackage ../development/interpreters/bic { }; + bit = callPackage ../applications/version-management/git-and-tools/bit { }; bitwarden = callPackage ../tools/security/bitwarden { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 200743944ee..8eb8a3944f9 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -964,6 +964,8 @@ let otfm = callPackage ../development/ocaml-modules/otfm { }; + otoml = callPackage ../development/ocaml-modules/otoml { }; + otr = callPackage ../development/ocaml-modules/otr { }; owee = callPackage ../development/ocaml-modules/owee { }; |