From 309c763d158102bb68f4b82c8c8a93d018b87480 Mon Sep 17 00:00:00 2001
From: lilly
Date: Tue, 11 Aug 2026 21:20:43 +0200
Subject: [PATCH] update git to nixos 26.05
---
flake.lock | 37 +++++++++++++++++++++++++++----------
flake.nix | 5 +++--
2 files changed, 30 insertions(+), 12 deletions(-)
diff --git a/flake.lock b/flake.lock
index b2142ed..21a71d5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -19,11 +19,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1778430510,
- "narHash": "sha256-Ti+ZBvW6yrWWAg2szExVTwCd4qOJ3KlVr1tFHfyfi8Q=",
+ "lastModified": 1782847189,
+ "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "8fd9daa3db09ced9700431c5b7ad0e8ba199b575",
+ "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41",
"type": "github"
},
"original": {
@@ -33,13 +33,29 @@
"type": "github"
}
},
- "nixpkgs-unstable": {
+ "nixpkgs-2605": {
"locked": {
- "lastModified": 1778672786,
- "narHash": "sha256-Blg88K1jwG+P0Mr27+rKMFCufdrWkV3wWh9AdYtz0FQ=",
+ "lastModified": 1786313170,
+ "narHash": "sha256-9BG7OgUWdu0ONDO5X2q6+K4bsuBITkX/3W4nNJu1Ito=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "eef00dfd8a712b34af845f9350bac681b1228bd1",
+ "rev": "fcb8fcd6bf2d0adecae5bd491afaaaf8311b758d",
+ "type": "github"
+ },
+ "original": {
+ "owner": "nixos",
+ "ref": "nixos-26.05",
+ "repo": "nixpkgs",
+ "type": "github"
+ }
+ },
+ "nixpkgs-unstable": {
+ "locked": {
+ "lastModified": 1786348146,
+ "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=",
+ "owner": "nixos",
+ "repo": "nixpkgs",
+ "rev": "d482ef84049d9b7276b83a06e4e4d76983830097",
"type": "github"
},
"original": {
@@ -53,6 +69,7 @@
"inputs": {
"authorizedKeysRepo": "authorizedKeysRepo",
"nixpkgs": "nixpkgs",
+ "nixpkgs-2605": "nixpkgs-2605",
"nixpkgs-unstable": "nixpkgs-unstable",
"sops-nix": "sops-nix"
}
@@ -64,11 +81,11 @@
]
},
"locked": {
- "lastModified": 1777944972,
- "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
+ "lastModified": 1786375908,
+ "narHash": "sha256-G7qDAT98nywA4EFmJCwIRO5wKvDlBBN3BWpsOnjAto8=",
"owner": "Mic92",
"repo": "sops-nix",
- "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
+ "rev": "d1337e05ba0a8e88a75d2c0e1595d82f3b3e2ac4",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 886024b..f802368 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,6 +7,7 @@
# https://github.com/NixOS/nixpkgs
nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+ nixpkgs-2605.url = "github:nixos/nixpkgs?ref=nixos-26.05";
# # Add nixos-generators as an input.
# # See here: https://github.com/nix-community/nixos-generators#using-in-a-flake
@@ -28,7 +29,7 @@
};
};
- outputs = { self, nixpkgs, nixpkgs-unstable, sops-nix, authorizedKeysRepo, ... }:
+ outputs = { self, nixpkgs, nixpkgs-unstable, nixpkgs-2605, sops-nix, authorizedKeysRepo, ... }:
let
specialArgs = {
inherit authorizedKeysRepo;
@@ -116,7 +117,7 @@
];
};
- git = nixpkgs.lib.nixosSystem {
+ git = nixpkgs-2605.lib.nixosSystem {
inherit system specialArgs;
modules = [
self.nixosModules.common