From 6d5708ee0c229eaaadf502a1198feaeb23280843 Mon Sep 17 00:00:00 2001 From: 0xda157 Date: Tue, 2 Dec 2025 06:40:02 -1000 Subject: [PATCH] flake: use 25.11 branch of dependencies (#2026) Link: https://github.com/nix-community/stylix/pull/2026 Reviewed-by: NAHO <90870942+trueNAHO@users.noreply.github.com> --- .editorconfig | 2 +- flake.lock | 8 ++++---- flake.nix | 2 +- flake/dev/flake.lock | 22 ++++++++++++---------- flake/dev/flake.nix | 6 +++--- 5 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.editorconfig b/.editorconfig index cef70f21..e814d0f4 100644 --- a/.editorconfig +++ b/.editorconfig @@ -6,7 +6,7 @@ end_of_line = lf indent_style = space insert_final_newline = true trim_trailing_whitespace = true -charset = utf-8 +charset = unset [*.{diff,patch}] end_of_line = unset diff --git a/flake.lock b/flake.lock index 09eba77b..c6c5b041 100644 --- a/flake.lock +++ b/flake.lock @@ -141,16 +141,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1764020296, + "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index 9a0502da..0cb6d797 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "Theming framework for NixOS, Home Manager, nix-darwin, and Nix-on-Droid"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; flake-parts = { url = "github:hercules-ci/flake-parts"; diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock index d839b015..056445fc 100644 --- a/flake/dev/flake.lock +++ b/flake/dev/flake.lock @@ -22,16 +22,16 @@ }, "dev-nixpkgs": { "locked": { - "lastModified": 1762977756, - "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=", + "lastModified": 1764020296, + "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55", + "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -117,15 +117,16 @@ ] }, "locked": { - "lastModified": 1760809591, - "narHash": "sha256-OxGcFcQdfOK8veZkPdQuqXIotFYiy4sBQB58dMNLeHY=", + "lastModified": 1764398914, + "narHash": "sha256-YPrpwlVQidzQlMh0OnquaJR+58rKe9YNnuRis293Ilo=", "owner": "nix-community", "repo": "home-manager", - "rev": "870883ba11ba1c84f756c0c1f9fa74cdb2a16c1e", + "rev": "d0c5fdc48db6f19471b8adc954eca09194e68036", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-25.11", "repo": "home-manager", "type": "github" } @@ -159,15 +160,16 @@ ] }, "locked": { - "lastModified": 1763393971, - "narHash": "sha256-FhgZD8pk3VE2SL0g4nCYKF0L6IO3uL110tfrBaZkdG0=", + "lastModified": 1764437343, + "narHash": "sha256-JK/vMdb71WIV9JtQXBCifs023EXL/chRT6CCct8iFaI=", "owner": "nix-community", "repo": "nixvim", - "rev": "7a30e6cf259d8db84aefc626058c074bd995d482", + "rev": "b09935ccf19e7d2f2bacf7ee056391c243b5f5ee", "type": "github" }, "original": { "owner": "nix-community", + "ref": "nixos-25.11", "repo": "nixvim", "type": "github" } diff --git a/flake/dev/flake.nix b/flake/dev/flake.nix index 1f0143a0..f078e3fa 100644 --- a/flake/dev/flake.nix +++ b/flake/dev/flake.nix @@ -120,7 +120,7 @@ # # [1]: https://github.com/NixOS/nix/blob/d4f67fd46dfe2bc950bdfa14273f87b8a4c32e47/doc/manual/source/release-notes/rl-2.26.md?plain=1#L3-L11 inputs = { - dev-nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; + dev-nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; dev-flake-parts = { url = "github:hercules-ci/flake-parts"; @@ -142,12 +142,12 @@ }; home-manager = { - url = "github:nix-community/home-manager"; + url = "github:nix-community/home-manager/release-25.11"; inputs.nixpkgs.follows = "dev-nixpkgs"; }; nixvim = { - url = "github:nix-community/nixvim"; + url = "github:nix-community/nixvim/nixos-25.11"; inputs = { flake-parts.follows = "dev-flake-parts"; nixpkgs.follows = "dev-nixpkgs";