diff options
| author | Vincent Ambo <mail@tazj.in> | 2020-08-14T20·48+0100 |
|---|---|---|
| committer | tazjin <mail@tazj.in> | 2020-08-15T00·26+0000 |
| commit | d44565d17e6e69089fb27d82b10f4c96f87b00bc (patch) | |
| tree | d3bf3035782991343e7eac156281e144e7262eef /third_party | |
| parent | 9108256ce4189532096bb325fd4f176af48f6bac (diff) | |
chore(3p): Pick Emacs & friends from the default channel r/1652
I had previously pinned Emacs to the (older) stable channel, because of a heretofore undiagnosed issue in newer versions. It turns out that the older Emacs is linking against X11-related libraries, namely <unintelligible>, which cause even *weirder* undiagnosed issues if paired with the rest of the recent packages. This commit removes the exception for Emacs and just picks it from the same channel as everything else. Change-Id: Ifce21c99f0204d4cf131bacb366dd9617fc301b8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/1751 Tested-by: BuildkiteCI Reviewed-by: tazjin <mail@tazj.in>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/default.nix | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/third_party/default.nix b/third_party/default.nix index 3be832320987..1781c3d33bce 100644 --- a/third_party/default.nix +++ b/third_party/default.nix @@ -64,8 +64,12 @@ let dfu-programmer dfu-util diffutils - dockerTools docker-compose + dockerTools + emacs26 + emacs26-nox + emacsPackages + emacsPackagesGen execline fd fetchFromGitHub @@ -127,8 +131,8 @@ let ripgrep rsync runCommand - runCommandNoCC runCommandLocal + runCommandNoCC rustPlatform rustc s6-portable-utils @@ -154,13 +158,6 @@ let zlib zstd; - # Inherit packages that should come from a stable channel - inherit (stableNixpkgs) - emacs26 - emacs26-nox - emacsPackages - emacsPackagesGen; - # Required by //third_party/nix inherit (nixpkgs) aws-sdk-cpp |