From 055d124b37a6c5f8d2c4dc454a64e449ac6c5560 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 17 Oct 2024 17:12:15 +0300 Subject: [PATCH 1/8] linux_testing: 6.12-rc2 -> 6.12-rc3 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 0fcba67ef6d7..4aecb88b7c13 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -1,7 +1,7 @@ { "testing": { - "version": "6.12-rc2", - "hash": "sha256:1cwivhfnfam79dvqj22vr63ng7330w6wihkx01l4l2q7f5kl896x" + "version": "6.12-rc3", + "hash": "sha256:11jspf9h3zmqnnyjardyk1g9k09fivwbl267iddb2ildfhgrlvqw" }, "6.1": { "version": "6.1.112", From 0910e4bbbb6dfb2b8a33b0dc09171ae53561d485 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 17 Oct 2024 17:12:21 +0300 Subject: [PATCH 2/8] linux_6_11: 6.11.3 -> 6.11.4 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 4aecb88b7c13..3c09fdae28d7 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -28,7 +28,7 @@ "hash": "sha256:0gj2z9ax1qv59n2mld0pg2svwi28lbq92ql98vy7crynd2ybrram" }, "6.11": { - "version": "6.11.3", - "hash": "sha256:0wwv8jaipx352rna6bxj6jklmnm4kcikvzaag59m4zf1mz866wh5" + "version": "6.11.4", + "hash": "sha256:0mcg1rrw9b0lwj88jkaw6ic2mks8xh8i92v90sbr2x35ljhb0m5x" } } From 0e4c64ff9cef5800c6a3f4838c66a918ceb61398 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 17 Oct 2024 17:12:25 +0300 Subject: [PATCH 3/8] linux_6_6: 6.6.56 -> 6.6.57 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 3c09fdae28d7..c717d6b01b7d 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -20,8 +20,8 @@ "hash": "sha256:0axkwfhvq3w2072xjqww476qa3rjglxyqmf72mlp9b5ymswil8kp" }, "6.6": { - "version": "6.6.56", - "hash": "sha256:158snxmb2silss8bndpzp8fmafp175v11jrlci0jr6c8ivvi4j7p" + "version": "6.6.57", + "hash": "sha256:1cxpmgbp8hhwa045gappf2wzh3kk1iw2xivsxzhvi6bgz5p45kk6" }, "6.10": { "version": "6.10.14", From d0227f7da53cc7d3088eafaf67282fd3d85cd6c7 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 17 Oct 2024 17:12:29 +0300 Subject: [PATCH 4/8] linux_6_1: 6.1.112 -> 6.1.113 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index c717d6b01b7d..56753a853e74 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -4,8 +4,8 @@ "hash": "sha256:11jspf9h3zmqnnyjardyk1g9k09fivwbl267iddb2ildfhgrlvqw" }, "6.1": { - "version": "6.1.112", - "hash": "sha256:094z3wfcxqx2rbi072i5frshpy6rdvk39aahwm9nc07vc8sxxn4b" + "version": "6.1.113", + "hash": "sha256:0c4y8j65b3im0bf4ji4n7nfqaqa7c7ym2515li855k1g363i1bsl" }, "5.15": { "version": "5.15.167", From e3aaef1472ccdd9568187b7f0cb909b96864d482 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 17 Oct 2024 17:12:32 +0300 Subject: [PATCH 5/8] linux_5_15: 5.15.167 -> 5.15.168 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 56753a853e74..0f0795c27211 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -8,8 +8,8 @@ "hash": "sha256:0c4y8j65b3im0bf4ji4n7nfqaqa7c7ym2515li855k1g363i1bsl" }, "5.15": { - "version": "5.15.167", - "hash": "sha256:0c6s6l5sz9ibws7bymb393ww0z9i3amsk1yx0bahipz3xhc1yxdi" + "version": "5.15.168", + "hash": "sha256:0yp1705rjadv2v7hw2yq9n3bxgqzmlyam2bnp49p10jnfkavpgng" }, "5.10": { "version": "5.10.226", From 2a1497e916a4feae70ae495f22bac3c32408c9dd Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 17 Oct 2024 17:12:36 +0300 Subject: [PATCH 6/8] linux_5_10: 5.10.226 -> 5.10.227 --- pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json index 0f0795c27211..e4f61b03c104 100644 --- a/pkgs/os-specific/linux/kernel/kernels-org.json +++ b/pkgs/os-specific/linux/kernel/kernels-org.json @@ -12,8 +12,8 @@ "hash": "sha256:0yp1705rjadv2v7hw2yq9n3bxgqzmlyam2bnp49p10jnfkavpgng" }, "5.10": { - "version": "5.10.226", - "hash": "sha256:19hwwl5sbya65mch7fwmji2cli9b8796zjqbmkybjrarg1j9m8gn" + "version": "5.10.227", + "hash": "sha256:1hknbfxq59731zmxgig7b69lfdmgh5jdg391hapvmlrh07hrvq2j" }, "5.4": { "version": "5.4.284", From beb7aeeca17873a52b00252ec07d89da7423f4e7 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 17 Oct 2024 17:15:56 +0300 Subject: [PATCH 7/8] linux-firmware: 20240909 -> 20241017 --- .../linux/firmware/linux-firmware/default.nix | 31 ++++++++++++++++--- 1 file changed, 26 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index ce75a4e30495..a3fa3f511b19 100644 --- a/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -1,25 +1,46 @@ { stdenvNoCC , fetchzip +, findutils , lib +, python3 , rdfind , which +, writeShellScriptBin }: - -stdenvNoCC.mkDerivation rec { +let + # check-whence.py attempts to call `git ls-files`, but we don't have a .git, + # because we've just downloaded a snapshot. We do, however, know that we're + # in a perfectly pristine tree, so we can fake just enough of git to run it. + gitStub = writeShellScriptBin "git" '' + if [ "$1" == "ls-files" ]; then + ${lib.getExe findutils} -type f -printf "%P\n" + else + echo "Git stub called with unexpected arguments $@" >&2 + exit 1 + fi + ''; +in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20240909"; + version = "20241017"; src = fetchzip { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; - hash = "sha256-3nwo4lGTV5PlsxZXa5D/7upaB+5XfXFZHbgEO5jnRrw="; + hash = "sha256-q4StJdoLCHQThFTzhxETDYlQP/ywmb3vwCr13xtrQzc="; }; + postUnpack = '' + patchShebangs . + ''; + nativeBuildInputs = [ + gitStub + python3 rdfind which ]; - installFlags = [ "DESTDIR=$(out)" ]; + installTargets = [ "install" "dedup" ]; + makeFlags = [ "DESTDIR=$(out)" ]; # Firmware blobs do not need fixing and should not be modified dontFixup = true; From 75e9810da8a272e23eb81bb08d21c6d2e64a4ccb Mon Sep 17 00:00:00 2001 From: Rahul Rameshbabu Date: Sun, 13 Oct 2024 11:36:31 -0700 Subject: [PATCH 8/8] linux: enable FF support for hid-nvidia-shield Enables FF support for 2017 NVIDIA SHIELD (Thunderstrike) controller. Signed-off-by: Rahul Rameshbabu --- pkgs/os-specific/linux/kernel/common-config.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 14800b895bd6..9ba531988229 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -993,6 +993,7 @@ let JOYSTICK_PSXPAD_SPI_FF = yes; LOGIG940_FF = yes; NINTENDO_FF = whenAtLeast "5.16" yes; + NVIDIA_SHIELD_FF = whenAtLeast "6.5" yes; PLAYSTATION_FF = whenAtLeast "5.12" yes; SONY_FF = yes; SMARTJOYPLUS_FF = yes;