flake: update inputs
nixpkgs moves from 2026-10-17 to 2026-11-01. Also updated: nix-amd-ai and sops-nix. Fallout handled in the same commit so every revision builds: - tlp-profile-switcher was dropped from nixpkgs (upstream declares only GNOME 48) and aider-chat's posthog dependency is broken on Python 3.14; take both from the previous nixpkgs until they evaluate again. - NSS 3.131.1 removed "emSign ECC Root CA - G3", and a blacklist entry for a missing root fails the cacert build; drop it. - A cached firefox-devedition is back in nixpkgs, so remove the 2026-07-05 pin. Assisted-by: Claude:opus-5-5
This commit is contained in:
parent
35f3e4cec1
commit
8f0062a5b0
4 changed files with 31 additions and 28 deletions
24
flake.lock
generated
24
flake.lock
generated
|
|
@ -118,11 +118,11 @@
|
||||||
"nixpkgs": "nixpkgs"
|
"nixpkgs": "nixpkgs"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792127429,
|
"lastModified": 1793639154,
|
||||||
"narHash": "sha256-Rmi/jXFWi6VMYGYPnlMmB/7umLPNJYE/WVlUZ9LoqyU=",
|
"narHash": "sha256-nX+KippNM1uBiqPoObeHJ8V4SYqbs8IwwA+FKscdO74=",
|
||||||
"owner": "noamsto",
|
"owner": "noamsto",
|
||||||
"repo": "nix-amd-ai",
|
"repo": "nix-amd-ai",
|
||||||
"rev": "8e1fd17dcc61bd179a90433109d5c5fa45631ff1",
|
"rev": "81e0fe56256568c2046b89a2129bc1dc6253883b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -170,11 +170,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1791594108,
|
"lastModified": 1793540411,
|
||||||
"narHash": "sha256-XK4KceonkwD8LuMAt/vNrz982mXJM5jeHAxMwsUXXAQ=",
|
"narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "6510408d147d8c5e6d76043e899e9251756f6a75",
|
"rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -201,11 +201,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792210252,
|
"lastModified": 1793540411,
|
||||||
"narHash": "sha256-Mh0PUaIv4nFY+8wAGonaEh8iBzwsmdNlwjVHmFg1Biw=",
|
"narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "09063bd1f2b36fd9fd793c36dfade7bd40a93dfc",
|
"rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -275,11 +275,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1792056300,
|
"lastModified": 1793657466,
|
||||||
"narHash": "sha256-YU1LjDe1o2Ymg5zEiCHbmMXLkDCtxHQRiVqZ3nC5GGk=",
|
"narHash": "sha256-GoOvpdsjO5hqZuO6T6ok9u6sJEjO0iPli2zRr9oNUNw=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "44931708c62937c2b1bf7953902989fa5bb9ee1b",
|
"rev": "b18e01ce148eb3efff5de2f2d3181ca53b2b2a54",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,20 @@
|
||||||
# System packages configuration
|
# System packages configuration
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{ config, pkgs, lib, inputs, ... }:
|
||||||
|
|
||||||
|
let
|
||||||
|
# nixpkgs 2026-10-17 (previous lock) for packages the 2026-11-01 bump broke:
|
||||||
|
# - tlp-profile-switcher: upstream declares only GNOME 48, so nixpkgs dropped
|
||||||
|
# it; it runs on 50 here because version validation is disabled.
|
||||||
|
# - aider-chat: its posthog dependency is marked broken (python 3.14).
|
||||||
|
# Drop each entry once it evaluates on the current nixpkgs again.
|
||||||
|
pkgsPrev = import (builtins.fetchTree {
|
||||||
|
type = "github";
|
||||||
|
owner = "NixOS";
|
||||||
|
repo = "nixpkgs";
|
||||||
|
rev = "09063bd1f2b36fd9fd793c36dfade7bd40a93dfc";
|
||||||
|
narHash = "sha256-Mh0PUaIv4nFY+8wAGonaEh8iBzwsmdNlwjVHmFg1Biw=";
|
||||||
|
}) { inherit (pkgs.stdenv.hostPlatform) system; };
|
||||||
|
in
|
||||||
{
|
{
|
||||||
# Allow unfree packages
|
# Allow unfree packages
|
||||||
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||||
|
|
@ -113,7 +127,7 @@
|
||||||
# terragrunt # broken in nixpkgs
|
# terragrunt # broken in nixpkgs
|
||||||
gh
|
gh
|
||||||
forgejo-cli # fj, for Forgejo (dev.narayana.im, dev.another.im)
|
forgejo-cli # fj, for Forgejo (dev.narayana.im, dev.another.im)
|
||||||
aider-chat # AI pair programming CLI (OpenRouter via ~/.local/bin/aider)
|
pkgsPrev.aider-chat # AI pair programming CLI (OpenRouter via ~/.local/bin/aider)
|
||||||
|
|
||||||
# WWAN modem tools
|
# WWAN modem tools
|
||||||
libmbim
|
libmbim
|
||||||
|
|
@ -143,7 +157,7 @@
|
||||||
xray
|
xray
|
||||||
|
|
||||||
# GNOME extensions
|
# GNOME extensions
|
||||||
gnomeExtensions.tlp-profile-switcher
|
pkgsPrev.gnomeExtensions.tlp-profile-switcher
|
||||||
gnomeExtensions.appindicator # tray icons (StatusNotifierItem): another.im's "Stay connected when closed"
|
gnomeExtensions.appindicator # tray icons (StatusNotifierItem): another.im's "Stay connected when closed"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,8 @@
|
||||||
# Drop these roots from the system CA bundle (names must match bundle labels)
|
# Drop these roots from the system CA bundle (names must match bundle labels)
|
||||||
security.pki.caCertificateBlacklist = [
|
security.pki.caCertificateBlacklist = [
|
||||||
"Comodo AAA Services root"
|
"Comodo AAA Services root"
|
||||||
"emSign ECC Root CA - G3"
|
# "emSign ECC Root CA - G3": removed upstream in NSS 3.131.1; a stale
|
||||||
|
# entry fails the cacert build.
|
||||||
];
|
];
|
||||||
|
|
||||||
# USBGuard configuration
|
# USBGuard configuration
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,6 @@
|
||||||
# Xray VLESS+Reality (PQ encryption) with sing-box TUN
|
# Xray VLESS+Reality (PQ encryption) with sing-box TUN
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
|
||||||
# Pin Firefox DevEdition to nixpkgs 2026-07-05: 152.0b8 is cached there,
|
|
||||||
# whereas the current nixpkgs ships the same version uncached with a broken
|
|
||||||
# source build (webrender COUNT identifier error). Drop this pin once a
|
|
||||||
# newer, cached devedition lands upstream.
|
|
||||||
pkgsFirefox = import (builtins.fetchTree {
|
|
||||||
type = "github";
|
|
||||||
owner = "NixOS";
|
|
||||||
repo = "nixpkgs";
|
|
||||||
rev = "d407951447dcd00442e97087bf374aad70c04cea";
|
|
||||||
}) { inherit (pkgs.stdenv.hostPlatform) system; config.allowUnfree = true; };
|
|
||||||
in
|
|
||||||
{
|
{
|
||||||
# Config is sops-encrypted; decrypted to /run/secrets at activation and
|
# Config is sops-encrypted; decrypted to /run/secrets at activation and
|
||||||
# handed to the DynamicUser service via LoadCredential (stays root-only 0400).
|
# handed to the DynamicUser service via LoadCredential (stays root-only 0400).
|
||||||
|
|
@ -143,7 +131,7 @@ in
|
||||||
# Firefox dev edition
|
# Firefox dev edition
|
||||||
programs.firefox = {
|
programs.firefox = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = pkgsFirefox.firefox-devedition;
|
package = pkgs.firefox-devedition;
|
||||||
policies = {
|
policies = {
|
||||||
# Estonian ID: load OpenSC PKCS#11 for TLS client-cert auth,
|
# Estonian ID: load OpenSC PKCS#11 for TLS client-cert auth,
|
||||||
# and force-install the Web eID extension (talks to web-eid-app host).
|
# and force-install the Web eID extension (talks to web-eid-app host).
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue