From e3926f5d1cd4ac97102701d80e96de998835fd55 Mon Sep 17 00:00:00 2001
From: Benedikt Peetz <benedikt.peetz@b-peetz.de>
Date: Sat, 7 Jun 2025 10:40:39 +0200
Subject: flake: Update to nixpkgs 25.05

---
 flake.nix | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'flake.nix')

diff --git a/flake.nix b/flake.nix
index d11bb41..9a5872d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "Nixos server config";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11-small";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05-small";
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable-small";
 
     library.url = "git+https://git.foss-syndicate.org/vhack.eu/nix-library?ref=prime";
@@ -48,12 +48,6 @@
     };
 
     # modules
-    disko = {
-      url = "github:nix-community/disko";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-      };
-    };
     agenix = {
       url = "github:ryantm/agenix";
       inputs = {
@@ -70,6 +64,12 @@
         treefmt-nix.follows = "treefmt-nix";
       };
     };
+    disko = {
+      url = "github:nix-community/disko";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
     impermanence = {
       url = "github:nix-community/impermanence";
       inputs = {};
@@ -78,7 +78,8 @@
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver/master";
       inputs = {
         flake-compat.follows = "flake-compat";
-        nixpkgs.follows = "nixpkgs";
+        nixpkgs-25_05.follows = "nixpkgs";
+        nixpkgs.follows = "nixpkgs-unstable";
       };
     };
   };
@@ -91,11 +92,11 @@
     treefmt-nix,
     deploy-rs,
     # modules
-    simple-nixos-mailserver,
-    impermanence,
-    disko,
     agenix,
     back,
+    disko,
+    impermanence,
+    simple-nixos-mailserver,
     ...
   } @ attrs: let
     system = "x86_64-linux";
@@ -124,11 +125,11 @@
       };
 
     extraModules = [
-      simple-nixos-mailserver.nixosModule
+      agenix.nixosModules.default
       back.nixosModules.default
       disko.nixosModules.default
       impermanence.nixosModules.impermanence
-      agenix.nixosModules.default
+      simple-nixos-mailserver.nixosModule
     ];
 
     tests = import ./tests {inherit pkgs specialArgs nixLib;};
-- 
cgit 1.4.1