diff options
author | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 09:12:42 -0700 |
---|---|---|
committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-05-20 09:12:42 -0700 |
commit | 14f3686af1dc4f2cb34b1445125df8241639746b (patch) | |
tree | 6af2f44fb1d6a1019eecd47e8b4e1fef9bc30aa4 /pkgs/development/tools/electron/default.nix | |
parent | 24f13758b9f5e8370bebd6f097bb1f931b0a967f (diff) | |
parent | 8aac6d8daf586ac6246e4233e00217258a738889 (diff) |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/terminal-emulators/alacritty/default.nix pkgs/servers/clickhouse/default.nix
Diffstat (limited to 'pkgs/development/tools/electron/default.nix')
-rw-r--r-- | pkgs/development/tools/electron/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index d5007989bcbb1..5ecec0059a029 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -101,6 +101,7 @@ rec { i686-linux = "b76e69ad4b654384b4f1647f0cb362e78c1d99be7b814d7d32abc22294639ace"; armv7l-linux = "cc4be8e0c348bc8db5002cf6c63c1d02fcb594f1f8bfc358168738c930098857"; aarch64-linux = "75665dd5b2b9938bb4572344d459db65f46c5f7c637a32946c5a822cc23a77dc"; + aarch64-darwin = "0c782b1d4eb848bae780f4e3a236caa1671486264c1f8e72fde98f1256d8f9e5"; headers = "0ip1wxgflifs86vk4xpz1555xa7yjy64ygqgd5a2g723148m52rk"; }; @@ -110,6 +111,7 @@ rec { i686-linux = "16023d86b88c7fccafd491c020d064caa2138d6a3493664739714555f72e5b06"; armv7l-linux = "53cc1250ff62f2353d8dd37552cbd7bdcaaa756106faee8b809303bed00e040a"; aarch64-linux = "3eddc0c507a43cce4e714bfe509d99218b5ab99f4660dd173aac2a895576dc71"; + aarch64-darwin = "2bc8f37af68e220f93fb9abc62d1c56d8b64baaf0ef9ef974f24ddcbe4f8b488"; headers = "1ji9aj7qr4b27m5kprsgsrl21rjphz5bbnmn6q0n2x84l429nyfb"; }; } |