diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-06 00:02:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-06 00:02:12 +0000 |
| commit | b23f12e076c6360253c27cf678bd88b4412a8039 (patch) | |
| tree | 7e8b0cdf87540786bd479efd758ecc633779eee6 /pkgs/os-specific/linux | |
| parent | 7c579fd487547974161fd0ab3023c8d41d99af3a (diff) | |
| parent | 413655a1cfdcb155ddb74882711f2b3a4e716933 (diff) | |
| download | nixlib-b23f12e076c6360253c27cf678bd88b4412a8039.tar nixlib-b23f12e076c6360253c27cf678bd88b4412a8039.tar.gz nixlib-b23f12e076c6360253c27cf678bd88b4412a8039.tar.bz2 nixlib-b23f12e076c6360253c27cf678bd88b4412a8039.tar.lz nixlib-b23f12e076c6360253c27cf678bd88b4412a8039.tar.xz nixlib-b23f12e076c6360253c27cf678bd88b4412a8039.tar.zst nixlib-b23f12e076c6360253c27cf678bd88b4412a8039.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/firmware/fwupd/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 8 |
2 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 3def168d2fa9..f4914d843272 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -8,6 +8,7 @@ , gobject-introspection , gettext , libgudev +, libdrm , polkit , libxmlb , glib @@ -18,14 +19,12 @@ , curl , libjcat , elfutils -, libsmbios , efivar , valgrind , meson , libuuid , colord , ninja -, gcab , gnutls , protobufc , python3 @@ -124,7 +123,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "1.9.6"; + version = "1.9.7"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -135,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; rev = finalAttrs.version; - hash = "sha256-9mA6gETnOmmkI+cdF0kP1moPV6DDvASq1JXarupM/tU="; + hash = "sha256-NhVCIjkwoTZptctIrkU9HgXzjr+KCUZfEKcjoYgAEdM="; }; patches = [ @@ -169,7 +168,6 @@ stdenv.mkDerivation (finalAttrs: { gettext shared-mime-info valgrind - gcab gnutls protobufc # for protoc python @@ -183,6 +181,7 @@ stdenv.mkDerivation (finalAttrs: { gusb sqlite libarchive + libdrm curl elfutils libgudev @@ -202,8 +201,6 @@ stdenv.mkDerivation (finalAttrs: { libcbor libqmi xz # for liblzma - ] ++ lib.optionals haveDell [ - libsmbios ] ++ lib.optionals haveFlashrom [ flashrom ]; diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index a55588b2ceaa..6577a0242254 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -6,14 +6,14 @@ let # NOTE: When updating these, please also take a look at the changes done to # kernel config in the xanmod version commit ltsVariant = { - version = "6.1.60"; - hash = "sha256-KYCeONJxyFPee4pvBLRw/MBTzPU7D2oZCrAVr3t/yPM="; + version = "6.1.61"; + hash = "sha256-15dAzCcFUekBlkBfcHWiZ3gourimLp6GlUKeWAddDqo="; variant = "lts"; }; mainVariant = { - version = "6.5.9"; - hash = "sha256-5SFPBsDTmq7tA6pyM7rbIjBPAtPbqhUl6VfA2z5baPA="; + version = "6.5.10"; + hash = "sha256-t99LKAmNApcjFVna3ChNZp4O6ag9t2kQVrg8yRsTANg="; variant = "main"; }; |