upd and cache

This commit is contained in:
mjallen18
2025-12-26 11:45:05 -06:00
parent f7cb1cb217
commit c9f75a053c
22 changed files with 523 additions and 126 deletions

View File

@@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "natekspencer";
domain = "bedjet";
version = "1.2.2";
version = "1.2.3";
src = fetchFromGitHub {
owner = owner;
repo = "ha-bedjet";
rev = version;
hash = "sha256-nJ2S1Wz/M/8my+5iDEMzfBZd9hKnrSBxUqnPfy6Tr7A=";
hash = "sha256-Zuidx6YrjqDzgtOTW380Rfzi1zHqJ07IrgBYztfM2II=";
};
propagatedBuildInputs = with python3Packages; [

View File

@@ -7,13 +7,13 @@
buildHomeAssistantComponent rec {
owner = "moralmunky";
domain = "mail_and_packages";
version = "0.4.3-b21";
version = "0.4.3";
src = fetchFromGitHub {
owner = owner;
repo = "Home-Assistant-Mail-And-Packages";
rev = version;
hash = "sha256-0lhDsjqsNU2d5cSjxzLIDU9986dvpQ6bNxgUNzmo6pU=";
hash = "sha256-7PVoWiN+o2QW9KVO4ht4ToFopULwzPCHCcUUGpUgNy8=";
};
propagatedBuildInputs = with python3Packages; [

View File

@@ -8,13 +8,13 @@
buildHomeAssistantComponent rec {
owner = "HASwitchPlate";
domain = "openhasp";
version = "0.7.7";
version = "0.7.8";
src = fetchFromGitHub {
owner = owner;
repo = "openHASP-custom-component";
rev = version;
hash = "sha256-sHrCsyxThUgUAadQBaC9wBVKzMojCJYjA5CUryN5+9g=";
hash = "sha256-5h1EqwpnsmWexqB3J/X4OcN9bfBYUxGxLF1Hrmoi5LY=";
};
propagatedBuildInputs = with pkgs.python3Packages; [

View File

@@ -485,6 +485,7 @@
"CONFIG_PM_STD_PARTITION" = "";
"CONFIG_PM_SLEEP" = "y";
"CONFIG_PM_SLEEP_SMP" = "y";
"CONFIG_PM_QOS_CPU_SYSTEM_WAKEUP" = "y";
"CONFIG_PM" = "y";
"CONFIG_PM_DEBUG" = "y";
"CONFIG_PM_SLEEP_DEBUG" = "y";
@@ -906,6 +907,7 @@
"CONFIG_BLK_MQ_STACKING" = "y";
"CONFIG_MQ_IOSCHED_DEADLINE" = "y";
"CONFIG_MQ_IOSCHED_KYBER" = "y";
"CONFIG_MQ_IOSCHED_ADIOS" = "y";
"CONFIG_IOSCHED_BFQ" = "y";
"CONFIG_BFQ_GROUP_IOSCHED" = "y";
"CONFIG_PREEMPT_NOTIFIERS" = "y";
@@ -1000,8 +1002,8 @@
"CONFIG_MM_ID" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_SHMEM_HUGE_NEVER" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_TMPFS_HUGE_NEVER" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_SHMEM_HUGE_ADVISE" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_TMPFS_HUGE_ADVISE" = "y";
"CONFIG_THP_SWAP" = "y";
"CONFIG_READ_ONLY_THP_FOR_FS" = "y";
"CONFIG_PAGE_MAPCOUNT" = "y";
@@ -3096,14 +3098,13 @@
"CONFIG_PSE_PD692X0" = "m";
"CONFIG_PSE_SI3474" = "m";
"CONFIG_PSE_TPS23881" = "m";
"CONFIG_CAN_DEV" = "m";
"CONFIG_CAN_DEV" = "y";
"CONFIG_CAN_VCAN" = "m";
"CONFIG_CAN_VXCAN" = "m";
"CONFIG_CAN_NETLINK" = "y";
"CONFIG_CAN_CALC_BITTIMING" = "y";
"CONFIG_CAN_RX_OFFLOAD" = "y";
"CONFIG_CAN_CAN327" = "m";
"CONFIG_CAN_DUMMY" = "m";
"CONFIG_CAN_JANZ_ICAN3" = "m";
"CONFIG_CAN_KVASER_PCIEFD" = "m";
"CONFIG_CAN_SLCAN" = "m";
@@ -5421,6 +5422,7 @@
"CONFIG_DVB_PLATFORM_DRIVERS" = "y";
"CONFIG_V4L_MEM2MEM_DRIVERS" = "y";
"CONFIG_VIDEO_MEM2MEM_DEINTERLACE" = "m";
"CONFIG_AMD_ISP4" = "m";
"CONFIG_VIDEO_CADENCE_CSI2RX" = "m";
"CONFIG_VIDEO_CADENCE_CSI2TX" = "m";
"CONFIG_VIDEO_CAFE_CCIC" = "m";
@@ -6745,7 +6747,6 @@
"CONFIG_HID_APPLETB_BL" = "m";
"CONFIG_HID_APPLETB_KBD" = "m";
"CONFIG_HID_ASUS" = "m";
"CONFIG_HID_ASUS_ALLY" = "m";
"CONFIG_HID_AUREAL" = "m";
"CONFIG_HID_BELKIN" = "m";
"CONFIG_HID_BETOP_FF" = "m";
@@ -9652,7 +9653,6 @@
"CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS" = "y";
"CONFIG_DYNAMIC_FTRACE_WITH_ARGS" = "y";
"CONFIG_DYNAMIC_FTRACE_WITH_JMP" = "y";
"CONFIG_FUNCTION_SELF_TRACING" = "y";
"CONFIG_FPROBE" = "y";
"CONFIG_FUNCTION_PROFILER" = "y";
"CONFIG_STACK_TRACER" = "y";

View File

@@ -486,6 +486,7 @@
"CONFIG_PM_STD_PARTITION" = "";
"CONFIG_PM_SLEEP" = "y";
"CONFIG_PM_SLEEP_SMP" = "y";
"CONFIG_PM_QOS_CPU_SYSTEM_WAKEUP" = "y";
"CONFIG_PM" = "y";
"CONFIG_PM_DEBUG" = "y";
"CONFIG_PM_SLEEP_DEBUG" = "y";
@@ -905,6 +906,7 @@
"CONFIG_BLK_MQ_STACKING" = "y";
"CONFIG_MQ_IOSCHED_DEADLINE" = "y";
"CONFIG_MQ_IOSCHED_KYBER" = "y";
"CONFIG_MQ_IOSCHED_ADIOS" = "y";
"CONFIG_IOSCHED_BFQ" = "y";
"CONFIG_BFQ_GROUP_IOSCHED" = "y";
"CONFIG_PREEMPT_NOTIFIERS" = "y";
@@ -999,8 +1001,8 @@
"CONFIG_MM_ID" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_SHMEM_HUGE_NEVER" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_TMPFS_HUGE_NEVER" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_SHMEM_HUGE_ADVISE" = "y";
"CONFIG_TRANSPARENT_HUGEPAGE_TMPFS_HUGE_ADVISE" = "y";
"CONFIG_THP_SWAP" = "y";
"CONFIG_READ_ONLY_THP_FOR_FS" = "y";
"CONFIG_PAGE_MAPCOUNT" = "y";
@@ -3095,14 +3097,13 @@
"CONFIG_PSE_PD692X0" = "m";
"CONFIG_PSE_SI3474" = "m";
"CONFIG_PSE_TPS23881" = "m";
"CONFIG_CAN_DEV" = "m";
"CONFIG_CAN_DEV" = "y";
"CONFIG_CAN_VCAN" = "m";
"CONFIG_CAN_VXCAN" = "m";
"CONFIG_CAN_NETLINK" = "y";
"CONFIG_CAN_CALC_BITTIMING" = "y";
"CONFIG_CAN_RX_OFFLOAD" = "y";
"CONFIG_CAN_CAN327" = "m";
"CONFIG_CAN_DUMMY" = "m";
"CONFIG_CAN_JANZ_ICAN3" = "m";
"CONFIG_CAN_KVASER_PCIEFD" = "m";
"CONFIG_CAN_SLCAN" = "m";
@@ -5421,6 +5422,7 @@
"CONFIG_DVB_PLATFORM_DRIVERS" = "y";
"CONFIG_V4L_MEM2MEM_DRIVERS" = "y";
"CONFIG_VIDEO_MEM2MEM_DEINTERLACE" = "m";
"CONFIG_AMD_ISP4" = "m";
"CONFIG_VIDEO_CADENCE_CSI2RX" = "m";
"CONFIG_VIDEO_CADENCE_CSI2TX" = "m";
"CONFIG_VIDEO_CAFE_CCIC" = "m";
@@ -6745,7 +6747,6 @@
"CONFIG_HID_APPLETB_BL" = "m";
"CONFIG_HID_APPLETB_KBD" = "m";
"CONFIG_HID_ASUS" = "m";
"CONFIG_HID_ASUS_ALLY" = "m";
"CONFIG_HID_AUREAL" = "m";
"CONFIG_HID_BELKIN" = "m";
"CONFIG_HID_BETOP_FF" = "m";
@@ -9648,7 +9649,6 @@
"CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS" = "y";
"CONFIG_DYNAMIC_FTRACE_WITH_ARGS" = "y";
"CONFIG_DYNAMIC_FTRACE_WITH_JMP" = "y";
"CONFIG_FUNCTION_SELF_TRACING" = "y";
"CONFIG_FPROBE" = "y";
"CONFIG_FUNCTION_PROFILER" = "y";
"CONFIG_STACK_TRACER" = "y";

View File

@@ -5,12 +5,12 @@
"hash": "sha256-EWgC3DrRZGFjzG/+m926JKgGm1aRNewFI815kGTy7bk="
},
"config": {
"rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
"hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c="
"rev": "b68aded713a580df028543faea77c4ca5ec1226b",
"hash": "sha256-W/8JwebN9BF9vpMV9yZpaSFGGazQWyhGEpmNI1XEugM="
},
"patches": {
"rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
"hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w="
"rev": "34c9301f5e6fa2817163e4134b0e71c7a7372634",
"hash": "sha256-G3eG5SmTiHz5VkMssfFTfLCGfvijTPDDkLiU9VI97TM="
},
"zfs": {
"rev": "fe5ed524c72e0b2e2cd4c47ee5bc987290e89666",

View File

@@ -5,12 +5,12 @@
"hash": "sha256-lQLF/+S4lDg8l6v8z3RDCoRzLwTuR2ucDYdjWynffbM="
},
"config": {
"rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
"hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c="
"rev": "b68aded713a580df028543faea77c4ca5ec1226b",
"hash": "sha256-W/8JwebN9BF9vpMV9yZpaSFGGazQWyhGEpmNI1XEugM="
},
"patches": {
"rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
"hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w="
"rev": "34c9301f5e6fa2817163e4134b0e71c7a7372634",
"hash": "sha256-G3eG5SmTiHz5VkMssfFTfLCGfvijTPDDkLiU9VI97TM="
},
"zfs": {
"rev": "fe5ed524c72e0b2e2cd4c47ee5bc987290e89666",

View File

@@ -1,16 +1,16 @@
{
"suffix": "-cachyos",
"linux": {
"version": "6.19-rc1",
"hash": "sha256-itUMYlX2BWUMmqeACu8ZaDMR/S2eBhDSIx1UZl9hh9E="
"version": "6.19-rc2",
"hash": "sha256-lQJVNXjrBA2XeUtEHj5bMHrMVPH2FnkfY59vf1kQG5g="
},
"config": {
"rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
"hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c="
"rev": "b68aded713a580df028543faea77c4ca5ec1226b",
"hash": "sha256-W/8JwebN9BF9vpMV9yZpaSFGGazQWyhGEpmNI1XEugM="
},
"patches": {
"rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
"hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w="
"rev": "34c9301f5e6fa2817163e4134b0e71c7a7372634",
"hash": "sha256-G3eG5SmTiHz5VkMssfFTfLCGfvijTPDDkLiU9VI97TM="
},
"zfs": {
"rev": "7de9800e5ce45d03c797be57a3e959fc914b2adb",

View File

@@ -8,13 +8,13 @@
},
"_config": "latest commit from https://github.com/CachyOS/linux-cachyos/commits/master/linux-cachyos",
"config": {
"rev": "9d369789361623b8a3b842a71adccb19b24ba16f",
"hash": "sha256-eh914fO4gYD8aCuUrMlPBRsxwwa2+qc9HCuAhrG6G9c="
"rev": "b68aded713a580df028543faea77c4ca5ec1226b",
"hash": "sha256-W/8JwebN9BF9vpMV9yZpaSFGGazQWyhGEpmNI1XEugM="
},
"_patches": "latest commit from https://github.com/CachyOS/kernel-patches/commits/master/x.y",
"patches": {
"rev": "e266fbc7f36273ebbc62a9bffda02e3882eb8f6c",
"hash": "sha256-LezfhAfTdfhvjiHSWe258SMUIs+cP8SHT8BiPou0A4w="
"rev": "34c9301f5e6fa2817163e4134b0e71c7a7372634",
"hash": "sha256-G3eG5SmTiHz5VkMssfFTfLCGfvijTPDDkLiU9VI97TM="
},
"_zfs": "search for `git+https://github.com/cachyos/zfs.git` in config's PKGBUILD",
"zfs": {

View File

@@ -8,7 +8,7 @@
python3Packages.buildPythonPackage rec {
pname = "python-roborock";
version = "3.19.0";
version = "3.21.1";
pyproject = true;
disabled = python3Packages.pythonOlder "3.11";
@@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec {
owner = "humbertogontijo";
repo = "python-roborock";
tag = "v${version}";
hash = "sha256-nCewSP0ZgQvjZ4Ie4/kTzxxmJ5Zsm5i3EuW4ZiDBPMg=";
hash = "sha256-8z8qK77F8SWxV+/GGW+B30LJdfRdja1nnFwXX0bvRao=";
};
pythonRelaxDeps = [ "pycryptodome" ];

View File

@@ -0,0 +1,113 @@
{
stdenv,
lib,
fetchFromGitHub,
buildLinux,
rpiVersion ? 5,
...
}@args:
let
# NOTE: raspberrypifw & raspberryPiWirelessFirmware should be updated with this
modDirVersion = "6.12.47";
tag = "stable_20250916";
hash = "sha256-HG8Oc04V2t54l0SOn4gKmNJWQUrZfjWusgKcWvx74H0==";
in
lib.overrideDerivation
(buildLinux (
args
// {
version = "${modDirVersion}-${tag}";
inherit modDirVersion;
pname = "linux-rpi";
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "linux";
inherit tag hash;
};
defconfig =
{
"1" = "bcmrpi_defconfig";
"2" = "bcm2709_defconfig";
"3" = if stdenv.hostPlatform.isAarch64 then "bcm2711_defconfig" else "bcm2709_defconfig";
"4" = "bcm2711_defconfig";
"5" = "bcm2712_defconfig";
}
.${toString rpiVersion};
features = {
efiBootStub = false;
}
// (args.features or { });
isLTS = true;
extraMeta =
if (rpiVersion < 3) then
{
platforms = with lib.platforms; lib.intersectLists arm linux;
hydraPlatforms = [ ];
}
else if (rpiVersion == 5) then
{
platforms = with lib.platforms; lib.intersectLists aarch64 linux;
hydraPlatforms = [ "aarch64-linux" ];
}
else
{
platforms = with lib.platforms; lib.intersectLists (arm ++ aarch64) linux;
hydraPlatforms = [ "aarch64-linux" ];
};
ignoreConfigErrors = true;
}
// (args.argsOverride or { })
))
(oldAttrs: {
postConfigure = ''
# The v7 defconfig has this set to '-v7' which screws up our modDirVersion.
sed -i $buildRoot/.config -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
sed -i $buildRoot/include/config/auto.conf -e 's/^CONFIG_LOCALVERSION=.*/CONFIG_LOCALVERSION=""/'
'';
# Make copies of the DTBs named after the upstream names so that U-Boot finds them.
# This is ugly as heck, but I don't know a better solution so far.
postFixup = ''
dtbDir=${if stdenv.hostPlatform.isAarch64 then "$out/dtbs/broadcom" else "$out/dtbs"}
rm $dtbDir/bcm283*.dtb
copyDTB() {
cp -v "$dtbDir/$1" "$dtbDir/$2"
}
''
+ lib.optionalString (lib.elem stdenv.hostPlatform.system [ "armv6l-linux" ]) ''
copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-zero-w.dtb bcm2835-rpi-zero-w.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-a.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b.dtb
copyDTB bcm2708-rpi-b.dtb bcm2835-rpi-b-rev2.dtb
copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-a-plus.dtb
copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-b-plus.dtb
copyDTB bcm2708-rpi-b-plus.dtb bcm2835-rpi-zero.dtb
copyDTB bcm2708-rpi-cm.dtb bcm2835-rpi-cm.dtb
''
+ lib.optionalString (lib.elem stdenv.hostPlatform.system [ "armv7l-linux" ]) ''
copyDTB bcm2709-rpi-2-b.dtb bcm2836-rpi-2-b.dtb
''
+
lib.optionalString
(lib.elem stdenv.hostPlatform.system [
"armv7l-linux"
"aarch64-linux"
])
''
copyDTB bcm2710-rpi-zero-2.dtb bcm2837-rpi-zero-2.dtb
copyDTB bcm2710-rpi-zero-2-w.dtb bcm2837-rpi-zero-2-w.dtb
copyDTB bcm2710-rpi-3-b.dtb bcm2837-rpi-3-b.dtb
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-a-plus.dtb
copyDTB bcm2710-rpi-3-b-plus.dtb bcm2837-rpi-3-b-plus.dtb
copyDTB bcm2710-rpi-cm3.dtb bcm2837-rpi-cm3.dtb
copyDTB bcm2711-rpi-4-b.dtb bcm2838-rpi-4-b.dtb
copyDTB bcm2712-rpi-5-b.dtb bcm2839-rpi-5-b.dtb
'';
})

View File

@@ -15,8 +15,8 @@ stdenv.mkDerivation (_finalAttrs: {
src = fetchFromGitHub {
owner = "raspberrypi";
repo = "utils";
rev = "6e0779b1c552976e0da2374c0325a8c9c77b6010";
hash = "sha256-gzcQdchmYZ8NSGDnozUK3JgEQAO5b7GCOzQeRL0nDM8";
rev = "063d092c528c09b9dad5d7ed187ebf110a53303b";
hash = "sha256-vi89lzfuLS9xKHDnlpm7Aw1UCOGCcMfd0cQq0rA9yOQ=";
};
buildInputs = [