From 56a13da9750ab7aa2ce58403ea3400f00a86ff60 Mon Sep 17 00:00:00 2001 From: Shahab Dogar Date: Sat, 11 Oct 2025 21:04:05 +0500 Subject: [PATCH] feat: upgrade nixos master cluster to nixpkgs 25.05 --- .gitignore | 1 + nixos/master/configuration.nix | 9 ++++----- nixos/master/flake.lock | 14 +++++++------- nixos/master/flake.nix | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 535aa1a..eece224 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ cdktf.log tsconfig.tsbuildinfo !jest.config.js !setup.js +result diff --git a/nixos/master/configuration.nix b/nixos/master/configuration.nix index 7a17fc0..e20b495 100644 --- a/nixos/master/configuration.nix +++ b/nixos/master/configuration.nix @@ -8,11 +8,10 @@ imports = [ ./hardware-configuration.nix ]; nix = { - package = pkgs.nixFlakes; - settings.require-sigs = false; - extraOptions = '' - experimental-features = nix-command flakes - ''; + settings = { + require-sigs = false; + experimental-features = [ "nix-command" "flakes" ]; + }; }; # Use the systemd-boot EFI boot loader. diff --git a/nixos/master/flake.lock b/nixos/master/flake.lock index d6e3d85..a56a7c2 100644 --- a/nixos/master/flake.lock +++ b/nixos/master/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1724031427, - "narHash": "sha256-o1HdAf+7IGv9M13R3c+zc/sJ0QgeEnhsvHBcodI4UpM=", + "lastModified": 1758287904, + "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", "owner": "nix-community", "repo": "disko", - "rev": "4e719b38fa7c85f4f65d0308ca7084c91e7bdd6d", + "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", "type": "github" }, "original": { @@ -22,16 +22,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1723938990, - "narHash": "sha256-9tUadhnZQbWIiYVXH8ncfGXGvkNq3Hag4RCBEMUk7MI=", + "lastModified": 1759994382, + "narHash": "sha256-wSK+3UkalDZRVHGCRikZ//CyZUJWDJkBDTQX1+G77Ow=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c42fcfbdfeae23e68fc520f9182dde9f38ad1890", + "rev": "5da4a26309e796daa7ffca72df93dbe53b8164c7", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.05", + "ref": "nixos-25.05", "repo": "nixpkgs", "type": "github" } diff --git a/nixos/master/flake.nix b/nixos/master/flake.nix index 8d12de3..0fe77fc 100644 --- a/nixos/master/flake.nix +++ b/nixos/master/flake.nix @@ -2,7 +2,7 @@ description = "Homelab NixOS Flake"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05"; # Disko disko = { url = "github:nix-community/disko";