diff options
| author | sterni <sternenseemann@systemli.org> | 2022-02-12T18·35+0100 |
|---|---|---|
| committer | sterni <sternenseemann@systemli.org> | 2022-02-13T09·15+0000 |
| commit | 235eda6649daf21825bec425eebd68da834c40ef (patch) | |
| tree | a35ec109d6afbdea610236a10860f3453571771b | |
| parent | c351aa5af4782f1f7a2dcbd09c4482e6ec884360 (diff) | |
chore(3p/sources): Bump channels & overlays r/3812
* //nix/buildLisp: re-enable CCL, as the crash has been fixed upstream, although it is unclear what exactly caused / fixed it. * //ops/whitby: the kitty build broke upstream, so we can't install the terminfo on whitby for a bit. Change-Id: I5710acbe837fbc936e334b2e81f9cf00ed6ae280 Reviewed-on: https://cl.tvl.fyi/c/depot/+/5274 Tested-by: BuildkiteCI Reviewed-by: tazjin <tazjin@tvl.su>
| -rw-r--r-- | nix/buildLisp/default.nix | 3 | ||||
| -rw-r--r-- | ops/machines/whitby/default.nix | 3 | ||||
| -rw-r--r-- | third_party/sources/sources.json | 18 |
3 files changed, 12 insertions, 12 deletions
diff --git a/nix/buildLisp/default.nix b/nix/buildLisp/default.nix index 13c215a467d1..a8168334a77b 100644 --- a/nix/buildLisp/default.nix +++ b/nix/buildLisp/default.nix @@ -154,8 +154,7 @@ let let implementation = old.implementation or defaultImplementation; brokenOn = old.brokenOn or [ ]; - # TODO(sterni): figure out why ccl stopped working and re-add the targets for it - targets = lib.subtractLists (brokenOn ++ [ "ccl" implementation.name ]) + targets = lib.subtractLists (brokenOn ++ [ implementation.name ]) (builtins.attrNames impls); in { diff --git a/ops/machines/whitby/default.nix b/ops/machines/whitby/default.nix index 0aa61fda80cf..11493b930bdb 100644 --- a/ops/machines/whitby/default.nix +++ b/ops/machines/whitby/default.nix @@ -466,7 +466,8 @@ in htop hyperfine jq - kitty.terminfo + # TODO(sterni): re-enable when the kitty build is fixed upstreams + # kitty.terminfo nano nvd ripgrep diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 570e412a0492..6a95c9dbd700 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -5,10 +5,10 @@ "homepage": "", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b95461861c8b5b7432cfc13306477d17c684d80d", - "sha256": "0cng0yk5wkdy959pnd76p3x12dmnnjb3p2bpx9c9fa9kfz36qdgw", + "rev": "c0c1cd1e3cc064fb3c08ac5624f478598d12a26c", + "sha256": "05kyslm19xwihv3n5kx5i5ph87bnxakdkf82lvn62x71bvzzndfj", "type": "tarball", - "url": "https://github.com/nix-community/emacs-overlay/archive/b95461861c8b5b7432cfc13306477d17c684d80d.tar.gz", + "url": "https://github.com/nix-community/emacs-overlay/archive/c0c1cd1e3cc064fb3c08ac5624f478598d12a26c.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs": { @@ -17,10 +17,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "60c52a73f1d5858020ac4f161cd5bf1c9650f8b8", - "sha256": "1xyi4xag084ikcbis3iixpvfsmlfm2s105j58770x7k24mkrif7n", + "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2", + "sha256": "0dcxc4yc2y5z08pmkmjws4ir0r2cbc5mha2a48bn0bk7nxc6wx8g", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/60c52a73f1d5858020ac4f161cd5bf1c9650f8b8.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/48d63e924a2666baf37f4f14a18f19347fbd54a2.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "nixpkgs-stable": { @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "521e4d7d13b09bc0a21976b9d19abd197d4e3b1e", - "sha256": "156b4wnm6y6lg0gz09mp48rd0mhcdazr5s888c4lbhlpn3j8h042", + "rev": "7adc9c14ec74b27358a8df9b973087e351425a79", + "sha256": "09dpk1c06jjcvxccgsgaz6a843vjgaglqpyix07fdc34hcrs5zmh", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/521e4d7d13b09bc0a21976b9d19abd197d4e3b1e.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/7adc9c14ec74b27358a8df9b973087e351425a79.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" } } |