diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-03 12:01:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-03 12:01:07 +0000 |
| commit | db0a71076b55bd8c326190eacd63eb7810205597 (patch) | |
| tree | cb54f73eee52c21e6868efb677fc63ba7c99b06a /pkgs/os-specific/linux | |
| parent | ddefebe702b501473e802f46c6008432b0d85042 (diff) | |
| parent | b957e614ea9806ec3c729752408c5902ea5d56af (diff) | |
| download | nixpkgs-db0a71076b55bd8c326190eacd63eb7810205597.tar nixpkgs-db0a71076b55bd8c326190eacd63eb7810205597.tar.gz nixpkgs-db0a71076b55bd8c326190eacd63eb7810205597.tar.bz2 nixpkgs-db0a71076b55bd8c326190eacd63eb7810205597.tar.lz nixpkgs-db0a71076b55bd8c326190eacd63eb7810205597.tar.xz nixpkgs-db0a71076b55bd8c326190eacd63eb7810205597.tar.zst nixpkgs-db0a71076b55bd8c326190eacd63eb7810205597.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/iotop-c/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/os-specific/linux/iotop-c/default.nix b/pkgs/os-specific/linux/iotop-c/default.nix index 016651deb49..1d7dc9e4d11 100644 --- a/pkgs/os-specific/linux/iotop-c/default.nix +++ b/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.24"; + version = "1.25"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "sha256-oSKNP/WY0Ivhj5LgyeerzZbleMcUn8ho0aqsiunqvyU="; + sha256 = "sha256-ZIvWdNxGSUmQtMKB/MVHEZ0fJ8b//zSXz+1r/P9ZDkE="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 6fe869e86c5..5b418b6a7cc 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.5.9"; #lqx - suffix = "lqx2"; #lqx - sha256 = "12l6z4bgrx5pf4fpcqsnzascr7f43cg1vwpayhgcwd7zimlbz1mg"; #lqx + version = "6.5.10"; #lqx + suffix = "lqx1"; #lqx + sha256 = "10bny5x2a3brfamyajvnl75h7s64vvmymgnvwgaq82q4bmsfcdd1"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { |