update to nixos 25.11

This commit is contained in:
Vinzenz Schroeter 2025-12-04 20:10:04 +01:00
parent 07a5fbca27
commit 0543c8b3f1
2 changed files with 49 additions and 14 deletions

43
flake.lock generated
View file

@ -30,11 +30,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1752689277, "lastModified": 1763384566,
"narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=", "narHash": "sha256-r+wgI+WvNaSdxQmqaM58lVNvJYJ16zoq+tKN20cLst4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "naersk", "repo": "naersk",
"rev": "0e72363d0938b0208d6c646d10649164c43f4d64", "rev": "d4155d6ebb70fbe2314959842f744aa7cabbbf6a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -45,11 +45,11 @@
}, },
"nix-filter": { "nix-filter": {
"locked": { "locked": {
"lastModified": 1731533336, "lastModified": 1757882181,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", "narHash": "sha256-+cCxYIh2UNalTz364p+QYmWHs0P+6wDhiWR4jDIKQIU=",
"owner": "numtide", "owner": "numtide",
"repo": "nix-filter", "repo": "nix-filter",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0", "rev": "59c44d1909c72441144b93cf0f054be7fe764de5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -60,16 +60,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1757545623, "lastModified": 1764677808,
"narHash": "sha256-mCxPABZ6jRjUQx3bPP4vjA68ETbPLNz9V2pk9tO7pRQ=", "narHash": "sha256-H3lC7knbXOBrHI9hITQ7modLuX20mYJVhZORL5ioms0=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8cd5ce828d5d1d16feff37340171a98fc3bf6526", "rev": "1aab89277eb2d87823d5b69bae631a2496cff57a",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "nixos",
"ref": "nixos-25.05", "ref": "nixos-25.11",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -78,7 +78,8 @@
"inputs": { "inputs": {
"naersk": "naersk", "naersk": "naersk",
"nix-filter": "nix-filter", "nix-filter": "nix-filter",
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs",
"treefmt-nix": "treefmt-nix"
} }
}, },
"rust-analyzer-src": { "rust-analyzer-src": {
@ -97,6 +98,26 @@
"repo": "rust-analyzer", "repo": "rust-analyzer",
"type": "github" "type": "github"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1762938485,
"narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View file

@ -2,12 +2,16 @@
description = "Flake for command line interface of the ServicePoint display."; description = "Flake for command line interface of the ServicePoint display.";
inputs = { inputs = {
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nix-filter.url = "github:numtide/nix-filter"; nix-filter.url = "github:numtide/nix-filter";
naersk = { naersk = {
url = "github:nix-community/naersk"; url = "github:nix-community/naersk";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
treefmt-nix = {
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
}; };
outputs = outputs =
@ -16,9 +20,18 @@
nixpkgs, nixpkgs,
naersk, naersk,
nix-filter, nix-filter,
treefmt-nix,
}: }:
let let
lib = nixpkgs.lib; lib = nixpkgs.lib;
treefmt-config = {
projectRootFile = "flake.nix";
programs = {
nixfmt.enable = true;
keep-sorted.enable = true;
rustfmt.enable = true;
};
};
supported-systems = [ supported-systems = [
"x86_64-linux" "x86_64-linux"
"aarch64-linux" "aarch64-linux"
@ -31,6 +44,7 @@
system: system:
f rec { f rec {
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
treefmt-eval = treefmt-nix.lib.evalModule pkgs treefmt-config;
inherit system; inherit system;
} }
); );
@ -63,7 +77,7 @@
[ [
xe xe
xz xz
ffmpeg-headless ffmpeg_6-headless.dev
] ]
++ lib.optionals pkgs.stdenv.isLinux ( ++ lib.optionals pkgs.stdenv.isLinux (
with pkgs; with pkgs;
@ -120,6 +134,6 @@
} }
); );
formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-tree); formatter = forAllSystems ({ treefmt-eval, ... }: treefmt-eval.config.build.wrapper);
}; };
} }