From 3efed27d624dede011a76a8dcd0724174b71f11e Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sat, 4 Feb 2023 00:24:32 +0000 Subject: [PATCH] treewide: adapt to newer nixpkgs --- nix/pkgs/copybara.nix | 1 + ops/nixos/cofractal-ams01/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nix/pkgs/copybara.nix b/nix/pkgs/copybara.nix index c272f229ea..b1b888284e 100644 --- a/nix/pkgs/copybara.nix +++ b/nix/pkgs/copybara.nix @@ -13,6 +13,7 @@ pkgs.buildBazelPackage rec { src = ../../third_party/copybara; nativeBuildInputs = with pkgs; [ git mercurial jdk makeWrapper ]; + bazel = pkgs.bazel_3; bazelTarget = "//java/com/google/copybara:copybara_deploy.jar"; removeRulesCC = false; diff --git a/ops/nixos/cofractal-ams01/default.nix b/ops/nixos/cofractal-ams01/default.nix index 3a83074591..d81459d3a3 100644 --- a/ops/nixos/cofractal-ams01/default.nix +++ b/ops/nixos/cofractal-ams01/default.nix @@ -31,7 +31,7 @@ boot.loader.efi.canTouchEfiVariables = true; # As of 2023-01-08, nixpkgs is pointed at Linux 5.15.86, which seems to hang with the E810-XXV NIC in this board. - boot.kernelPackages = if builtins.compareVersions pkgs.linuxPackages.kernel.version "6.0" != -1 then throw "cofractal-ams01: maybe try the stock kernel again? now at ${pkgs.linuxPackages.kernel.version}" else pkgs.linuxPackages_6_0; + boot.kernelPackages = if builtins.compareVersions pkgs.linuxPackages.kernel.version "6.0" != -1 then throw "cofractal-ams01: maybe try the stock kernel again? now at ${pkgs.linuxPackages.kernel.version}" else pkgs.linuxPackages_6_1; boot.blacklistedKernelModules = [ "ib_core" "irdma" ]; powerManagement.cpuFreqGovernor = lib.mkDefault "performance";