crans
/
nixos
mirror of https://gitlab.crans.org/nounous/nixos
19
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nixpkgs-update-26-05' into 'main' 

nixpkgs: 25.11 -> 26.05

See merge request nounous/nixos!69
main
lzebulon 2026-06-11 19:45:19 +02:00
parent d5872883d8 4b286b878a
commit 09ddc79fad
6 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
flake.lock
View File

@ -50,11 +50,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1775087534, "lastModified": 1778716662,
"narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -86,27 +86,27 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1776434932, "lastModified": 1780902259,
"narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=", "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c7f47036d3df2add644c46d712d14262b7d86c0c", "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "owner": "NixOS",
"ref": "nixos-25.11", "ref": "nixos-26.05",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1774748309, "lastModified": 1777168982,
"narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixpkgs.lib", "repo": "nixpkgs.lib",
"rev": "333c4e0545a6da976206c74db8773a1645b5870a", "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -145,11 +145,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1775636079, "lastModified": 1780220602,
"narHash": "sha256-pc20NRoMdiar8oPQceQT47UUZMBTiMdUuWrYu2obUP0=", "narHash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "790751ff7fd3801feeaf96d7dc416a8d581265ba", "rev": "db947814a175b7ca6ded66e21383d938df01c227",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View File

@ -2,7 +2,7 @@
description = "Configuration NixOS du Crans"; description = "Configuration NixOS du Crans";
inputs = { 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"; flake-parts.url = "github:hercules-ci/flake-parts";
# Formatter # Formatter

1
hosts/iso/default.nix
View File

@ -20,6 +20,7 @@
kernelParams = [ "console=ttyS0,115200" ]; kernelParams = [ "console=ttyS0,115200" ];
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
supportedFilesystems = lib.mkForce [ "btrfs" "vfat" "zfs"]; supportedFilesystems = lib.mkForce [ "btrfs" "vfat" "zfs"];
zfs.forceImportRoot = lib.mkDefault false;
}; };
services.openssh = { services.openssh = {

6
hosts/physiques/thot/default.nix
View File

@ -1,4 +1,4 @@
{ pkgs, ... }: { lib, pkgs, ... }:
{ {
imports = [ imports = [
@ -27,7 +27,9 @@
"head" "head"
"backups" "backups"
]; ];
forceImportAll = true; forceImportAll = lib.mkForce true;
# Ajouté suite au passage en 26.05 par souci de cohérence
forceImportRoot = lib.mkForce true;
}; };
}; };

2
hosts/vm/neo/synapse-admin.nix
View File

@ -1,7 +1,7 @@
{ pkgs, ... }: { pkgs, ... }:
let let
synapse-admin_over = pkgs.synapse-admin-etkecc.overrideAttrs (_: { synapse-admin_over = pkgs.ketesa.overrideAttrs (_: {
yarnBuildFlags = "--base=/admin"; yarnBuildFlags = "--base=/admin";
}); });
synapse-admin = synapse-admin_over.withConfig { synapse-admin = synapse-admin_over.withConfig {

6
modules/default.nix
View File

@ -1,4 +1,4 @@
{ ... }: { lib, ... }:
{ {
imports = [ imports = [
@ -24,4 +24,8 @@
useTmpfs = true; useTmpfs = true;
cleanOnBoot = true; cleanOnBoot = true;
}; };
# Recommandé depuis le passage à 26.05
boot.zfs.forceImportAll = lib.mkDefault false;
boot.zfs.forceImportRoot = lib.mkDefault false;
} }