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

chore(3p): bump NixOS channels to 2021-12-15

Browse source 
* Switch from (unused) NixOS 21.05 to newly released NixOS 21.11
  channel.

* grfn/machines/yeren: Linux 5.14.x -> 5.15.x

* 3p/gerrit, 3p/gerrit_plugin/oauth: update dependency bundle output
  hashes to what whitby comes up with now.

Change-Id: Id3bfe3d07b9223f77ec628954783a6b0a48f4086
Reviewed-on: https://cl.tvl.fyi/c/depot/+/4310
Tested-by: BuildkiteCI
Autosubmit: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: tazjin <mail@tazj.in>
This commit is contained in:
sterni 2021-12-14 01:32:09 +01:00 committed by clbot
parent d292f899f9
commit 6b285f008d
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
third_party/gerrit/default.nix vendored
View file

@ -62,7 +62,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage {
fetchConfigured = true; fetchConfigured = true;
fetchAttrs = { fetchAttrs = {
sha256 = "sha256:16a1lbz40bc7217ldwf7x8yzlzxc714h965ldjnmfbvi3jq3hk6y"; sha256 = "sha256:1q4sclf18zzh8hsnccg1y7vqnhgavq62mqp4xx50zxfcnixfkpbx";
preBuild = '' preBuild = ''
rm .bazelversion rm .bazelversion
''; '';

2
third_party/gerrit_plugins/oauth/default.nix vendored
View file

@ -4,7 +4,7 @@ let
inherit (import ../builder.nix args) buildGerritBazelPlugin; inherit (import ../builder.nix args) buildGerritBazelPlugin;
in buildGerritBazelPlugin rec { in buildGerritBazelPlugin rec {
name = "oauth"; name = "oauth";
depsOutputHash = "sha256:0ww88msym6zr5z86k5az1kmw3hv8d9giniwkii4lwnzf3kc5qnrx"; depsOutputHash = "sha256:0j86amkw54y177s522hc988hqg034fsrkywbsb9a7h14zwcqbran";
src = pkgs.fetchgit { src = pkgs.fetchgit {
url = "https://gerrit.googlesource.com/plugins/oauth"; url = "https://gerrit.googlesource.com/plugins/oauth";
rev = "4aa7322db5ec221b2419e12a9ec7af5b8c66659c"; rev = "4aa7322db5ec221b2419e12a9ec7af5b8c66659c";

12
third_party/nixpkgs/default.nix vendored
View file

@ -13,16 +13,16 @@ let
# nixos-unstable, and the current stable channel of the latest NixOS # nixos-unstable, and the current stable channel of the latest NixOS
# release. # release.
# Tracking nixpkgs master as of 2021-12-07. # Tracking nixos-unstable as of 2021-12-15.
unstableHashes = { unstableHashes = {
commit = "f4eddfe2fdef11dcbcc4139c6b91b78a9e1c28c5"; commit = "a2e281f5770247855b85d70c43454ba5bff34613";
sha256 = "196agg765k1ai9m2nh7hgc5lzhff9dkv80q2ij0yyacngjbzy5dd"; sha256 = "03m6b3yvx7v8gwib848aclwqpg02rhqdh9h511w9byyfvha9g0fg";
}; };
# Tracking nixos-21.05 as of 2021-12-07. # Tracking nixos-21.11 as of 2021-12-12.
stableHashes = { stableHashes = {
commit = "4a8751d694b46340072d95409804f59b98326f44"; commit = "573095944e7c1d58d30fc679c81af63668b54056";
sha256 = "14pmmd82s0anknd6g57i0c1795766bvylqalf9kz730q1v0ransl"; sha256 = "07s5cwhskqvy82b4rld9b14ljc0013pig23i3jx3l3f957rk95pg";
}; };
# import the nixos-unstable package set, or optionally use the # import the nixos-unstable package set, or optionally use the

2
tools/depot-nixpkgs-update.nix
View file

@ -5,7 +5,7 @@ let
getBins getBins
; ;
stableRelease = "21.05"; stableRelease = "21.11";
channelsUrl = "https://channels.nixos.org"; channelsUrl = "https://channels.nixos.org";
archiveUrl = "https://github.com/NixOS/nixpkgs/archive/"; archiveUrl = "https://github.com/NixOS/nixpkgs/archive/";

2
users/grfn/system/system/machines/yeren.nix
View file

@ -27,7 +27,7 @@
}; };
}; };
kernelPackages = pkgs.linuxPackages_5_14; kernelPackages = pkgs.linuxPackages_5_15;
kernelModules = [ "kvm-intel" ]; kernelModules = [ "kvm-intel" ];
blacklistedKernelModules = [ "psmouse" ]; blacklistedKernelModules = [ "psmouse" ];