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

* //3p/nixpkgs: allow insecure qtwebkit, since a package
  in grfn's home depends on it. Reasoning for marking
  qtwebkit as insecure is given here:
  https://blogs.gnome.org/mcatanzaro/2022/11/04/stop-using-qtwebkit/

* //3p/gerrit: update nondeterministic bazel output hash

Change-Id: Ie652905969bf43abb457f6af211f771cff093dce
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7353
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
This commit is contained in:
sterni 2022-11-23 02:08:48 +01:00
parent 419a9ab0fe
commit 467cb89145
3 changed files with 21 additions and 16 deletions

View file

@ -55,7 +55,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
fetchConfigured = true; fetchConfigured = true;
fetchAttrs = { fetchAttrs = {
sha256 = "sha256:09nfjw8376amrymblnjl4v85zgxrvc93zblvxrh23k7af62bk1nk"; sha256 = "sha256:1nmx8w0n5l2qhdf9w79dlxxp4fghdlmbbw60w082y8g3y4lpzafn";
preBuild = '' preBuild = ''
rm .bazelversion rm .bazelversion
''; '';

View file

@ -28,6 +28,11 @@ let
# Forbids our meta.ci attribute # Forbids our meta.ci attribute
# https://github.com/NixOS/nixpkgs/pull/191171#issuecomment-1260650771 # https://github.com/NixOS/nixpkgs/pull/191171#issuecomment-1260650771
checkMeta = false; checkMeta = false;
# TODO(grfn): Currently needed for subsurface, set globally to avoid
# reimporting nixpkgs in home-manager
permittedInsecurePackages = [
"qtwebkit-5.212.0-alpha4"
];
}; };
inherit localSystem; inherit localSystem;

View file

@ -17,10 +17,10 @@
"homepage": "", "homepage": "",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "f301f0c632a7af8681a02eca35b3e1d271be2c37", "rev": "89f2e82fec9f7c2dde0381976266a245f0072217",
"sha256": "1fwjq982fz5amm71cmyazsa0z9xhi3vjqv2jbv08rg1a9yn5vx31", "sha256": "0ys8qcr4q9hc1b3hfkr6rwdgi92axhih540hw215d5rxcrasrqlq",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/f301f0c632a7af8681a02eca35b3e1d271be2c37.tar.gz", "url": "https://github.com/nix-community/emacs-overlay/archive/89f2e82fec9f7c2dde0381976266a245f0072217.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"home-manager": { "home-manager": {
@ -29,10 +29,10 @@
"homepage": "https://nix-community.github.io/home-manager/", "homepage": "https://nix-community.github.io/home-manager/",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "fe85cc4c37d5f37104e349c5553029417e3833d1", "rev": "f7641a3ff398ccce952e19a199d775934e518c1d",
"sha256": "1ym6wprkwckhvlv6yjikl07lyn15hsgnwm4brk9yn912h947d9vv", "sha256": "1g29q4b82rn1y9nvwwxhpy1avvi5hnd3jvkp4zn57gk4fa7n06i8",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/fe85cc4c37d5f37104e349c5553029417e3833d1.tar.gz", "url": "https://github.com/nix-community/home-manager/archive/f7641a3ff398ccce952e19a199d775934e518c1d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"impermanence": { "impermanence": {
@ -65,10 +65,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "54be84c3ac0122c2b2272fc68a9015304bc0bb73", "rev": "20fc948445a6c22d4e8d5178e9a6bc6e1f5417c8",
"sha256": "18wams1qsf36f4m46m258y9kbdj7igp66i0yl55w03cb7fqvs1g9", "sha256": "1jrg5xjsbhdynjlh5pn4f6j567hjlv3ljv9dgfh6shn1ll23hlik",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/54be84c3ac0122c2b2272fc68a9015304bc0bb73.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/20fc948445a6c22d4e8d5178e9a6bc6e1f5417c8.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": {
@ -89,10 +89,10 @@
"homepage": "", "homepage": "",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "f0ddbb639e2f23529ced79602cee6eb3903fc888", "rev": "9652ef34c7439eca9f86cee11e94dbef5c9adb09",
"sha256": "1k8lbawzvjls9by2fsw8gbdbmgqfmif9fay5bi1wf14nwm6654q4", "sha256": "0n60705lrmb0idhbjhhrc1balazlznxxg7as5lsl367bb5hk1dk8",
"type": "tarball", "type": "tarball",
"url": "https://github.com/oxalica/rust-overlay/archive/f0ddbb639e2f23529ced79602cee6eb3903fc888.tar.gz", "url": "https://github.com/oxalica/rust-overlay/archive/9652ef34c7439eca9f86cee11e94dbef5c9adb09.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"rustsec-advisory-db": { "rustsec-advisory-db": {
@ -101,10 +101,10 @@
"homepage": "https://rustsec.org", "homepage": "https://rustsec.org",
"owner": "RustSec", "owner": "RustSec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "0608c47076f4e7ff8ca2ce4967a9411407d4b185", "rev": "d339676e47e280c86304e9b05bed224e2087dda0",
"sha256": "0g2hjmjdpfaa0wchai97g0frsfjmbwqzz1k7r5xh3zl15scdd774", "sha256": "0agdsx6b78a51ad9ifwg2nsf5jav6kh0bikkqjs8zz92q1qg5zxn",
"type": "tarball", "type": "tarball",
"url": "https://github.com/RustSec/advisory-db/archive/0608c47076f4e7ff8ca2ce4967a9411407d4b185.tar.gz", "url": "https://github.com/RustSec/advisory-db/archive/d339676e47e280c86304e9b05bed224e2087dda0.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }