public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-05-16 01:00:58 +00:00
committed by GitHub
parent f1b78f8618 8ceb0380a2
commit b484cef365
41 changed files with 3677 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/all-packages.nix
+6 -2
View File
@@ -11888,7 +11888,7 @@ in
duktape = callPackage ../development/interpreters/duktape { };
evcxr = callPackage ../development/interpreters/evcxr {
inherit (darwin.apple_sdk.frameworks) Security;
inherit (darwin.apple_sdk.frameworks) CoreServices Security;
};
beam = callPackage ./beam-packages.nix { };
@@ -14977,7 +14977,9 @@ in
cairomm = callPackage ../development/libraries/cairomm { };
cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix { };
cairomm_1_16 = callPackage ../development/libraries/cairomm/1.16.nix {
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
pango = callPackage ../development/libraries/pango {
harfbuzz = harfbuzz.override { withCoreText = stdenv.isDarwin; };
@@ -26793,6 +26795,8 @@ in
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
neovide = callPackage ../applications/editors/neovim/neovide { };
neovim-remote = callPackage ../applications/editors/neovim/neovim-remote.nix { };
vis = callPackage ../applications/editors/vis {