From d26864894f4e8cb60585cc3ffcd7ff4a3d56b316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20L=C3=A9vy?= Date: Thu, 11 Jun 2026 15:46:48 +0200 Subject: [PATCH 1/4] nixpkgs: 25.11 -> 26.05 --- flake.lock | 26 +++++++++++++------------- flake.nix | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index cf0608d..a606991 100644 --- a/flake.lock +++ b/flake.lock @@ -50,11 +50,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", "type": "github" }, "original": { @@ -86,27 +86,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776434932, - "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", + "lastModified": 1780902259, + "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", + "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-26.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -145,11 +145,11 @@ ] }, "locked": { - "lastModified": 1775636079, - "narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", + "lastModified": 1780220602, + "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", + "rev": "db947814a175b7ca6ded66e21383d938df01c227", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e645f3d..757108a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Configuration NixOS du Crans"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05"; flake-parts.url = "github:hercules-ci/flake-parts"; # Formatter From c9ec7af7da22b3a770130ed3172f8d416467420c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20L=C3=A9vy?= Date: Thu, 11 Jun 2026 15:58:39 +0200 Subject: [PATCH 2/4] nixpkgs: synapse-admin-etkecc -> ketesa --- hosts/vm/neo/synapse-admin.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hosts/vm/neo/synapse-admin.nix b/hosts/vm/neo/synapse-admin.nix index 193b29b..cfd0f0b 100644 --- a/hosts/vm/neo/synapse-admin.nix +++ b/hosts/vm/neo/synapse-admin.nix @@ -1,7 +1,7 @@ { pkgs, ... }: let - synapse-admin_over = pkgs.synapse-admin-etkecc.overrideAttrs (_: { + synapse-admin_over = pkgs.ketesa.overrideAttrs (_: { yarnBuildFlags = "--base=/admin"; }); synapse-admin = synapse-admin_over.withConfig { From 53884d6afd5c0b2ff0795a42016028d3f8556b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20L=C3=A9vy?= Date: Thu, 11 Jun 2026 16:04:32 +0200 Subject: [PATCH 3/4] Set boot.zfs.forceImportRoot = false Suite aux recommendations de nixpkgs. --- modules/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/default.nix b/modules/default.nix index 6a72322..ef7599e 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -24,4 +24,7 @@ useTmpfs = true; cleanOnBoot = true; }; + + # Recommandé depuis le passage à 26.05 + boot.zfs.forceImportRoot = false; } From 4b286b878a8295c13d7478debee52ed2c0ba6169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillaume=20L=C3=A9vy?= Date: Thu, 11 Jun 2026 17:39:06 +0200 Subject: [PATCH 4/4] Set de forceImportRoot hors du default dans /iso --- hosts/iso/default.nix | 1 + hosts/physiques/thot/default.nix | 6 ++++-- modules/default.nix | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/hosts/iso/default.nix b/hosts/iso/default.nix index 0933dcc..f47e339 100644 --- a/hosts/iso/default.nix +++ b/hosts/iso/default.nix @@ -20,6 +20,7 @@ kernelParams = [ "console=ttyS0,115200" ]; kernelPackages = pkgs.linuxPackages_latest; supportedFilesystems = lib.mkForce [ "btrfs" "vfat" "zfs"]; + zfs.forceImportRoot = lib.mkDefault false; }; services.openssh = { diff --git a/hosts/physiques/thot/default.nix b/hosts/physiques/thot/default.nix index ba780fa..80d4f99 100644 --- a/hosts/physiques/thot/default.nix +++ b/hosts/physiques/thot/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ lib, pkgs, ... }: { imports = [ @@ -27,7 +27,9 @@ "head" "backups" ]; - forceImportAll = true; + forceImportAll = lib.mkForce true; + # Ajouté suite au passage en 26.05 par souci de cohérence + forceImportRoot = lib.mkForce true; }; }; diff --git a/modules/default.nix b/modules/default.nix index ef7599e..be2ac91 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,4 +1,4 @@ -{ ... }: +{ lib, ... }: { imports = [ @@ -26,5 +26,6 @@ }; # Recommandé depuis le passage à 26.05 - boot.zfs.forceImportRoot = false; + boot.zfs.forceImportAll = lib.mkDefault false; + boot.zfs.forceImportRoot = lib.mkDefault false; }