From ed5fee36ed584ad1af4d99dd09b2ad2c65aa7807 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Sat, 2 Dec 2023 01:04:13 +0000 Subject: [PATCH] beatific: Add 23.11 input --- flake.lock | 44 ++++++++++++++++++++++---------------------- flake.nix | 24 ++++++++++++------------ 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/flake.lock b/flake.lock index 722c6b3..34468e4 100644 --- a/flake.lock +++ b/flake.lock @@ -38,7 +38,7 @@ ], "nixos-shell": "nixos-shell", "nixpkgs": [ - "nixpkgs-next" + "nixpkgs-2305" ] }, "locked": { @@ -58,7 +58,7 @@ "intake-sources": { "inputs": { "nixpkgs": [ - "nixpkgs-next" + "nixpkgs-2305" ] }, "locked": { @@ -103,7 +103,7 @@ ], "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs" + "nixpkgs-2305" ] }, "locked": { @@ -120,23 +120,7 @@ "type": "github" } }, - "nixpkgs": { - "locked": { - "lastModified": 1669833724, - "narHash": "sha256-/HEZNyGbnQecrgJnfE8d0WC5c1xuPSD2LUpB6YXlg4c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "4d2b37a84fad1091b9de401eb450aae66f1a741e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "22.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-next": { + "nixpkgs-2305": { "locked": { "lastModified": 1685566663, "narHash": "sha256-btHN1czJ6rzteeCuE/PNrdssqYD2nIA4w48miQAFloM=", @@ -152,14 +136,30 @@ "type": "github" } }, + "nixpkgs-2311": { + "locked": { + "lastModified": 1701282334, + "narHash": "sha256-MxCVrXY6v4QmfTwIysjjaX0XUhqBbxTWWB4HXtDYsdk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "057f9aecfb71c4437d2b27d3323df7f93c010b7e", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "flake-compat": "flake-compat", "intake": "intake", "intake-sources": "intake-sources", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs", - "nixpkgs-next": "nixpkgs-next" + "nixpkgs-2305": "nixpkgs-2305", + "nixpkgs-2311": "nixpkgs-2311" } } }, diff --git a/flake.nix b/flake.nix index 591b436..6589a46 100644 --- a/flake.nix +++ b/flake.nix @@ -1,31 +1,31 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/22.11"; - nixpkgs-next.url = "github:NixOS/nixpkgs/23.05"; + nixpkgs-2305.url = "github:NixOS/nixpkgs/23.05"; + nixpkgs-2311.url = "github:NixOS/nixpkgs/23.11"; flake-compat = { url = "github:edolstra/flake-compat"; flake = false; }; nixos-wsl = { url = "github:nix-community/NixOS-WSL"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs-2305"; inputs.flake-compat.follows = "flake-compat"; }; intake = { url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake.git"; - inputs.nixpkgs.follows = "nixpkgs-next"; + inputs.nixpkgs.follows = "nixpkgs-2305"; inputs.flake-compat.follows = "flake-compat"; }; intake-sources = { url = "git+ssh://gitea@git.alogoulogoi.com/Jaculabilis/intake-sources.git"; - inputs.nixpkgs.follows = "nixpkgs-next"; + inputs.nixpkgs.follows = "nixpkgs-2305"; }; }; outputs = { self, - nixpkgs, - nixpkgs-next, + nixpkgs-2305, + nixpkgs-2311, flake-compat, nixos-wsl, intake, @@ -34,21 +34,21 @@ nixosModules.beatific = import ./modules/beatific.nix; nixosConfigurations = { - backyard = nixpkgs-next.lib.nixosSystem { + backyard = nixpkgs-2305.lib.nixosSystem { system = "x86_64-linux"; modules = [ self.nixosModules.beatific ./machine/backyard ]; }; - catacomb = nixpkgs-next.lib.nixosSystem { + catacomb = nixpkgs-2305.lib.nixosSystem { system = "aarch64-linux"; modules = [ self.nixosModules.beatific ./machine/catacomb ]; }; - empyrean = nixpkgs-next.lib.nixosSystem { + empyrean = nixpkgs-2305.lib.nixosSystem { system = "x86_64-linux"; modules = [ self.nixosModules.beatific @@ -57,14 +57,14 @@ ./machine/empyrean ]; }; - stagirite = nixpkgs-next.lib.nixosSystem { + stagirite = nixpkgs-2305.lib.nixosSystem { system = "x86_64-linux"; modules = [ nixos-wsl.nixosModules.wsl ./machine/stagirite ]; }; - unfolder = nixpkgs-next.lib.nixosSystem { + unfolder = nixpkgs-2305.lib.nixosSystem { system = "x86_64-linux"; modules = [ self.nixosModules.beatific