From 9864dbd34897bdcec15fbd6707447db2c3335680 Mon Sep 17 00:00:00 2001 From: derfenix Date: Mon, 1 Dec 2025 02:47:23 +0300 Subject: [PATCH] Switch to 25.11 --- flake.lock | 72 +++++++++++++++++++++++++++--------------------------- flake.nix | 14 +++++------ 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/flake.lock b/flake.lock index 5aa8b51..dbdd263 100644 --- a/flake.lock +++ b/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1764510518, - "narHash": "sha256-hDFkciyjhjMLRC/qXCREWX1dgq8kopiuJdwXdfVlJuQ=", + "lastModified": 1764544324, + "narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=", "owner": "nix-community", "repo": "home-manager", - "rev": "83053e1d337f33e0b48250588006e4b9df2f0d9d", + "rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612", "type": "github" }, "original": { @@ -107,6 +107,38 @@ } }, "nixpkgs": { + "locked": { + "lastModified": 1764494334, + "narHash": "sha256-x2xCEXUlU4Ap56+t5HaoReOQ/bV/bIQ5rzTn/m+V3HQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d542db745310b6929708d9abea513f3ff19b1341", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-master": { + "locked": { + "lastModified": 1764546042, + "narHash": "sha256-+9lpYa2zGOH+wKRMEJcm/cycJe7nHZkFZUbvK30HKlc=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0f2f740139ea83741ba38413ce427b0e222467e3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-unstable": { "locked": { "lastModified": 1764242076, "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=", @@ -122,38 +154,6 @@ "type": "github" } }, - "nixpkgs-master": { - "locked": { - "lastModified": 1764517825, - "narHash": "sha256-nSnujSkevFTp9Uj2oF0EgUGDN6JQrF0+t0s0wmo4sZ8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "a6cbeb112d847fe6196f1040d663c797f7ecfd04", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1764316264, - "narHash": "sha256-82L+EJU+40+FIdeG4gmUlOF1jeSwlf2AwMarrpdHF6o=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a7b80b6f82a71ea04270d7ba11b48855681c4b0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, "photocatalog": { "inputs": { "nixpkgs": [ @@ -212,7 +212,7 @@ "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-master": "nixpkgs-master", - "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-unstable": "nixpkgs-unstable", "photocatalog": "photocatalog", "raspberry-pi-nix": "raspberry-pi-nix" } diff --git a/flake.nix b/flake.nix index cdebbe0..732baf5 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,8 @@ description = "Fxnet system configurations"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; home-manager = { url = "github:nix-community/home-manager"; @@ -33,7 +33,7 @@ { self, nixpkgs, - nixpkgs-stable, + nixpkgs-unstable, nixpkgs-master, ... }@inputs: @@ -56,9 +56,9 @@ config.allowUnfree = true; } ); - pkgsStableSettings = + pkgsUnstableSettings = system: - import nixpkgs-stable { + import nixpkgs-unstable { inherit system; config.allowUnfree = true; }; @@ -93,7 +93,7 @@ ]; extraSpecialArgs = { inherit inputs; - pkgsStable = pkgsStableSettings pkgs.system; + pkgsUnstable = pkgsUnstableSettings pkgs.system; pkgsMaster = pkgsMasterSettings pkgs.system; hosts = hosts; }; @@ -120,7 +120,7 @@ system = host.system; specialArgs = { inherit inputs; - pkgsStable = pkgsStableSettings host.system; + pkgsUnstable = pkgsUnstableSettings host.system; pkgsMaster = pkgsMasterSettings host.system; hosts = hosts; quirks = (quirks: (import ./quirks { inherit quirks; }));