lukegb/depot
1
0
Fork 0
Code Issues 1 Pull requests Projects Packages Activity Actions

treewide: adapt to newer nixpkgs

Browse source
This commit is contained in:
Luke Granger-Brown 2023-02-04 00:24:32 +00:00
parent a0cb138ada
commit 3efed27d62
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
nix/pkgs/copybara.nix
View file

@ -13,6 +13,7 @@ pkgs.buildBazelPackage rec {
src = ../../third_party/copybara; src = ../../third_party/copybara;
nativeBuildInputs = with pkgs; [ git mercurial jdk makeWrapper ]; nativeBuildInputs = with pkgs; [ git mercurial jdk makeWrapper ];
bazel = pkgs.bazel_3;
bazelTarget = "//java/com/google/copybara:copybara_deploy.jar"; bazelTarget = "//java/com/google/copybara:copybara_deploy.jar";
removeRulesCC = false; removeRulesCC = false;

2
ops/nixos/cofractal-ams01/default.nix
View file

@ -31,7 +31,7 @@
boot.loader.efi.canTouchEfiVariables = true; 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. # 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" ]; boot.blacklistedKernelModules = [ "ib_core" "irdma" ];
powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; powerManagement.cpuFreqGovernor = lib.mkDefault "performance";