chore(3p/sources): bump channels & overlays (2024-03-17)

In hope that iwlwifi works again on this commit, and I don't actually
have to debug it.

Includes following changes:

* users/aspen: home-manager is shuffling around pinentry options again
* users/flokli: rebase ipu6-softisp patches to Linux 6.8
                make cl/11097 a separate patch
* ops/modules: remove unused (and now broken) v4l2loopback module

Co-Authored-By: Florian Klink <flokli@flokli.de>
Change-Id: I763f1f075778f2ed8db7803f87248c9dabde4213
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11174
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: aspen <root@gws.fyi>
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2024-03-17 13:45:37 +03:00 committed by clbot
parent 3dd708690f
commit 3633d846f8
6 changed files with 1993 additions and 1073 deletions

View file

@ -1,12 +0,0 @@
{ config, lib, pkgs, ... }:
{
boot = {
extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
kernelModules = [ "v4l2loopback" ];
extraModprobeConfig = ''
options v4l2loopback exclusive_caps=1
'';
};
}

View file

@ -17,10 +17,10 @@
"homepage": "", "homepage": "",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "a230393bb7e2db667c63c3f5c279a6e26d8b1c5a", "rev": "15f5f7d5eb82b1d2e7a4f754b11480b91aea9e91",
"sha256": "0qirvr63w4q8ik356vhalsi14ln5145dfad3x05qh02xiwi8b057", "sha256": "14fzs2b0h2lsbygrla6bx0a1r8jf2q4y1rl226ia7kcl5sakgzi9",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/emacs-overlay/archive/a230393bb7e2db667c63c3f5c279a6e26d8b1c5a.tar.gz", "url": "https://github.com/nix-community/emacs-overlay/archive/15f5f7d5eb82b1d2e7a4f754b11480b91aea9e91.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"home-manager": { "home-manager": {
@ -29,10 +29,10 @@
"homepage": "https://nix-community.github.io/home-manager/", "homepage": "https://nix-community.github.io/home-manager/",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "36f873dfc8e2b6b89936ff3e2b74803d50447e0a", "rev": "206f457fffdb9a73596a4cb2211a471bd305243d",
"sha256": "1i5az5dbjxslrk73j77xk7ww33kwdhhjw94ac25r704lzi2qs80n", "sha256": "0imc472hq7mmqhf5h8rhgfplw6575rl15fni0dc4wpypv9jccia9",
"type": "tarball", "type": "tarball",
"url": "https://github.com/nix-community/home-manager/archive/36f873dfc8e2b6b89936ff3e2b74803d50447e0a.tar.gz", "url": "https://github.com/nix-community/home-manager/archive/206f457fffdb9a73596a4cb2211a471bd305243d.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"impermanence": { "impermanence": {
@ -77,10 +77,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", "rev": "d691274a972b3165335d261cc4671335f5c67de9",
"sha256": "0v5q4zadnmdiv8hwcsx804l8radx562aqdw0r5nld127c8f7jzz8", "sha256": "05lkkw0a63v1zan5g31blhckw6zf66p4gfqkpp01mp7fqwykmzx4",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/3030f185ba6a4bf4f18b87f345f104e6a6961f34.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/d691274a972b3165335d261cc4671335f5c67de9.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
@ -89,10 +89,10 @@
"homepage": "", "homepage": "",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d", "rev": "8ac30a39abc5ea67037dfbf090d6e89f187c6e50",
"sha256": "1j5vs24bgy2arl342lrh3znc1pdz68kcjp2rpgy3sccpd9sibqqn", "sha256": "0g8iy5qgb6qp2nq9p0yqhh1w5yp60v90h8zlkgxqhx4dj2fw9vy6",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/b94a96839afcc56de3551aa7472b8d9a3e77e05d.tar.gz", "url": "https://github.com/NixOS/nixpkgs/archive/8ac30a39abc5ea67037dfbf090d6e89f187c6e50.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"rust-overlay": { "rust-overlay": {
@ -101,10 +101,10 @@
"homepage": "", "homepage": "",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c", "rev": "50db54295d3922a3b7a40d580b84d75150b36c34",
"sha256": "114jsacnmy62c6pz9249sbbvzx29cls2jli4rz3bzzydxn07hxd6", "sha256": "0v8indbzb97dk9qk4srrxq8z5ds614kazi72zcxjhjzdxc8mklj7",
"type": "tarball", "type": "tarball",
"url": "https://github.com/oxalica/rust-overlay/archive/d09dac6a63a2ac4b74ac2ecdc19acd8c46c2da2c.tar.gz", "url": "https://github.com/oxalica/rust-overlay/archive/50db54295d3922a3b7a40d580b84d75150b36c34.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"rustsec-advisory-db": { "rustsec-advisory-db": {
@ -113,10 +113,10 @@
"homepage": "https://rustsec.org", "homepage": "https://rustsec.org",
"owner": "RustSec", "owner": "RustSec",
"repo": "advisory-db", "repo": "advisory-db",
"rev": "120db258e97454f900dff7cb8eb1b61a134f3eb0", "rev": "369d98c1b95b7b56d0859605916d7b81a7d1f1c4",
"sha256": "1ghnpribfrfsrx7r1bpi7b3g3yxdraci3jx34lgllwcy318g6rn2", "sha256": "1npq87rjn606fhrpaxkphn8spdr1xafpy79nvrc3dnlvq163sr5n",
"type": "tarball", "type": "tarball",
"url": "https://github.com/RustSec/advisory-db/archive/120db258e97454f900dff7cb8eb1b61a134f3eb0.tar.gz", "url": "https://github.com/RustSec/advisory-db/archive/369d98c1b95b7b56d0859605916d7b81a7d1f1c4.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
} }
} }

View file

@ -72,8 +72,7 @@ in
services.gpg-agent = { services.gpg-agent = {
enable = true; enable = true;
# previous default has been removed from nixpkgs pinentryPackage = pkgs.pinentry-qt;
pinentryFlavor = "qt";
}; };
services.lorri.enable = true; services.lorri.enable = true;

View file

@ -5,7 +5,7 @@ https://copr.fedorainfracloud.org/coprs/jwrdegoede/ipu6-softisp/.
It's supposed to be included in your NixOS configuration imports, and will: It's supposed to be included in your NixOS configuration imports, and will:
- Add some patches to your kernel, which should apply on 6.7.x - Add some patches to your kernel, which should apply on 6.8.x
- Add the `ipu6-camera-bins` firmware (still needed) - Add the `ipu6-camera-bins` firmware (still needed)
- Enable some kernel config options - Enable some kernel config options
- Add an udev rule so libcamera can do DMABUF things - Add an udev rule so libcamera can do DMABUF things
@ -16,6 +16,9 @@ It's supposed to be included in your NixOS configuration imports, and will:
Please make sure you don't have any of the `hardware.ipu6` options still Please make sure you don't have any of the `hardware.ipu6` options still
enabled, as they use the closed-source userspace stack and will conflict. enabled, as they use the closed-source userspace stack and will conflict.
Also make sure to track nixos-unstable for this. This code will get periodically
updated to be compatible with nixos-unstable!
The testing instructions from The testing instructions from
https://copr.fedorainfracloud.org/coprs/jwrdegoede/ipu6-softisp/ still apply. https://copr.fedorainfracloud.org/coprs/jwrdegoede/ipu6-softisp/ still apply.

File diff suppressed because it is too large Load diff

View file

@ -11,10 +11,6 @@ let
}; };
in in
lib.fix (self: { lib.fix (self: {
imports = [
(depot.path.origSrc + "/ops/modules/v4l2loopback.nix")
];
boot = { boot = {
tmp.useTmpfs = true; tmp.useTmpfs = true;
kernelModules = [ "kvm-amd" ]; kernelModules = [ "kvm-amd" ];