mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/sources): Bump channels & overlays

Browse source 
* //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>
This commit is contained in:
sterni 2022-02-12 19:35:34 +01:00
parent c351aa5af4
commit 235eda6649
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
nix/buildLisp/default.nix
View file

@ -154,8 +154,7 @@ let
let let
implementation = old.implementation or defaultImplementation; implementation = old.implementation or defaultImplementation;
brokenOn = old.brokenOn or [ ]; brokenOn = old.brokenOn or [ ];
# TODO(sterni): figure out why ccl stopped working and re-add the targets for it targets = lib.subtractLists (brokenOn ++ [ implementation.name ])
targets = lib.subtractLists (brokenOn ++ [ "ccl" implementation.name ])
(builtins.attrNames impls); (builtins.attrNames impls);
in in
{ {

3
ops/machines/whitby/default.nix
View file

@ -466,7 +466,8 @@ in
htop htop
hyperfine hyperfine
jq jq
kitty.terminfo # TODO(sterni): re-enable when the kitty build is fixed upstreams
# kitty.terminfo
nano nano
nvd nvd
ripgrep ripgrep

18
third_party/sources/sources.json vendored
View file

@ -5,10 +5,10 @@
"homepage": "", "homepage": "",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "b95461861c8b5b7432cfc13306477d17c684d80d", "rev": "c0c1cd1e3cc064fb3c08ac5624f478598d12a26c",
"sha256": "0cng0yk5wkdy959pnd76p3x12dmnnjb3p2bpx9c9fa9kfz36qdgw", "sha256": "05kyslm19xwihv3n5kx5i5ph87bnxakdkf82lvn62x71bvzzndfj",
"type": "tarball", "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" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs": { "nixpkgs": {
@ -17,10 +17,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "60c52a73f1d5858020ac4f161cd5bf1c9650f8b8", "rev": "48d63e924a2666baf37f4f14a18f19347fbd54a2",
"sha256": "1xyi4xag084ikcbis3iixpvfsmlfm2s105j58770x7k24mkrif7n", "sha256": "0dcxc4yc2y5z08pmkmjws4ir0r2cbc5mha2a48bn0bk7nxc6wx8g",
"type": "tarball", "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" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@ -29,10 +29,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "521e4d7d13b09bc0a21976b9d19abd197d4e3b1e", "rev": "7adc9c14ec74b27358a8df9b973087e351425a79",
"sha256": "156b4wnm6y6lg0gz09mp48rd0mhcdazr5s888c4lbhlpn3j8h042", "sha256": "09dpk1c06jjcvxccgsgaz6a843vjgaglqpyix07fdc34hcrs5zmh",
"type": "tarball", "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" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }