From 6b285f008d9cc79ec3dc4f4be10005ce35af12aa Mon Sep 17 00:00:00 2001 From: sterni Date: Tue, 14 Dec 2021 01:32:09 +0100 Subject: chore(3p): bump NixOS channels to 2021-12-15 * 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 Reviewed-by: grfn Reviewed-by: tazjin --- third_party/gerrit/default.nix | 2 +- third_party/gerrit_plugins/oauth/default.nix | 2 +- third_party/nixpkgs/default.nix | 12 ++++++------ tools/depot-nixpkgs-update.nix | 2 +- users/grfn/system/system/machines/yeren.nix | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/third_party/gerrit/default.nix b/third_party/gerrit/default.nix index f886a0426d52..4873cf09b900 100644 --- a/third_party/gerrit/default.nix +++ b/third_party/gerrit/default.nix @@ -62,7 +62,7 @@ pkgs.lib.makeOverridable pkgs.buildBazelPackage { fetchConfigured = true; fetchAttrs = { - sha256 = "sha256:16a1lbz40bc7217ldwf7x8yzlzxc714h965ldjnmfbvi3jq3hk6y"; + sha256 = "sha256:1q4sclf18zzh8hsnccg1y7vqnhgavq62mqp4xx50zxfcnixfkpbx"; preBuild = '' rm .bazelversion ''; diff --git a/third_party/gerrit_plugins/oauth/default.nix b/third_party/gerrit_plugins/oauth/default.nix index 2298c0b39d93..76c053ae423f 100644 --- a/third_party/gerrit_plugins/oauth/default.nix +++ b/third_party/gerrit_plugins/oauth/default.nix @@ -4,7 +4,7 @@ let inherit (import ../builder.nix args) buildGerritBazelPlugin; in buildGerritBazelPlugin rec { name = "oauth"; - depsOutputHash = "sha256:0ww88msym6zr5z86k5az1kmw3hv8d9giniwkii4lwnzf3kc5qnrx"; + depsOutputHash = "sha256:0j86amkw54y177s522hc988hqg034fsrkywbsb9a7h14zwcqbran"; src = pkgs.fetchgit { url = "https://gerrit.googlesource.com/plugins/oauth"; rev = "4aa7322db5ec221b2419e12a9ec7af5b8c66659c"; diff --git a/third_party/nixpkgs/default.nix b/third_party/nixpkgs/default.nix index 9b9afb9262ec..c457ad801c1f 100644 --- a/third_party/nixpkgs/default.nix +++ b/third_party/nixpkgs/default.nix @@ -13,16 +13,16 @@ let # nixos-unstable, and the current stable channel of the latest NixOS # release. - # Tracking nixpkgs master as of 2021-12-07. + # Tracking nixos-unstable as of 2021-12-15. unstableHashes = { - commit = "f4eddfe2fdef11dcbcc4139c6b91b78a9e1c28c5"; - sha256 = "196agg765k1ai9m2nh7hgc5lzhff9dkv80q2ij0yyacngjbzy5dd"; + commit = "a2e281f5770247855b85d70c43454ba5bff34613"; + sha256 = "03m6b3yvx7v8gwib848aclwqpg02rhqdh9h511w9byyfvha9g0fg"; }; - # Tracking nixos-21.05 as of 2021-12-07. + # Tracking nixos-21.11 as of 2021-12-12. stableHashes = { - commit = "4a8751d694b46340072d95409804f59b98326f44"; - sha256 = "14pmmd82s0anknd6g57i0c1795766bvylqalf9kz730q1v0ransl"; + commit = "573095944e7c1d58d30fc679c81af63668b54056"; + sha256 = "07s5cwhskqvy82b4rld9b14ljc0013pig23i3jx3l3f957rk95pg"; }; # import the nixos-unstable package set, or optionally use the diff --git a/tools/depot-nixpkgs-update.nix b/tools/depot-nixpkgs-update.nix index 2475ca2e2330..6557b2f25a4f 100644 --- a/tools/depot-nixpkgs-update.nix +++ b/tools/depot-nixpkgs-update.nix @@ -5,7 +5,7 @@ let getBins ; - stableRelease = "21.05"; + stableRelease = "21.11"; channelsUrl = "https://channels.nixos.org"; archiveUrl = "https://github.com/NixOS/nixpkgs/archive/"; diff --git a/users/grfn/system/system/machines/yeren.nix b/users/grfn/system/system/machines/yeren.nix index c6aff886de2f..5bdb8eab0cf5 100644 --- a/users/grfn/system/system/machines/yeren.nix +++ b/users/grfn/system/system/machines/yeren.nix @@ -27,7 +27,7 @@ }; }; - kernelPackages = pkgs.linuxPackages_5_14; + kernelPackages = pkgs.linuxPackages_5_15; kernelModules = [ "kvm-intel" ]; blacklistedKernelModules = [ "psmouse" ]; -- cgit 1.4.1