From bbe240e612faabc37810503a3dafc494656d79fa Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sat, 8 Jun 2024 09:27:27 -0400 Subject: [PATCH] jhovold: 6.10.0-rc1 -> 6.10.0-rc2 --- module.nix | 1 + npins/sources.json | 8 ++++---- packages/default.nix | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/module.nix b/module.nix index 2d31c17..711a9f3 100644 --- a/module.nix +++ b/module.nix @@ -137,6 +137,7 @@ in # https://github.com/jhovold/linux/wiki/X13s#camera services.udev.extraRules = '' + ACTION=="add", SUBSYSTEM=="dma_heap", KERNEL=="linux,cma", GROUP="video", MODE="0660" ACTION=="add", SUBSYSTEM=="dma_heap", KERNEL=="system", GROUP="video", MODE="0660" ''; diff --git a/npins/sources.json b/npins/sources.json index e5097db..889820e 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -7,10 +7,10 @@ "owner": "jhovold", "repo": "linux" }, - "branch": "wip/sc8280xp-6.10-rc1", - "revision": "0a82d7f4bb087c9c57a7a185f77c987f3fc4f5b2", - "url": "https://github.com/jhovold/linux/archive/0a82d7f4bb087c9c57a7a185f77c987f3fc4f5b2.tar.gz", - "hash": "024wzfj0z5ljpkw6r7qj4wcw0r9cf1aw0rmmnikgg02i777rs2sg" + "branch": "wip/sc8280xp-6.10-rc2", + "revision": "9782b2bf13a2832bdcf0b6c682e92ea5e06cd174", + "url": "https://github.com/jhovold/linux/archive/9782b2bf13a2832bdcf0b6c682e92ea5e06cd174.tar.gz", + "hash": "0zfvqsdyh06j25qalap4yzf7m457j3nb9cj3m8mkvp805shhhsjm" } }, "version": 3 diff --git a/packages/default.nix b/packages/default.nix index 0eb51e6..d4a059d 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -17,7 +17,7 @@ in rec { linux_jhovold = pkgs.callPackage linux_x13s_pkg { src = sources.linux-jhovold; - version = "6.10.0-rc1"; + version = "6.10.0-rc2"; defconfig = "johan_defconfig"; };