diff --git a/flake.lock b/flake.lock index 3517bf3..dfa91e7 100644 --- a/flake.lock +++ b/flake.lock @@ -954,6 +954,22 @@ "type": "github" } }, + "nixpkgs-23_11": { + "locked": { + "lastModified": 1706373441, + "narHash": "sha256-S1hbgNbVYhuY2L05OANWqmRzj4cElcbLuIkXTb69xkk=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "56911ef3403a9318b7621ce745f5452fb9ef6867", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-lib": { "locked": { "dir": "lib", @@ -1554,6 +1570,7 @@ "gc": "gc", "login": "login", "nixpkgs": "nixpkgs_10", + "nixpkgs-23_11": "nixpkgs-23_11", "nixpkgs-unstable": "nixpkgs-unstable_5", "sso-test": "sso-test" } diff --git a/flake.nix b/flake.nix index f889003..8563b32 100644 --- a/flake.nix +++ b/flake.nix @@ -1,6 +1,7 @@ { inputs = { nixpkgs.url = github:NixOS/nixpkgs/nixos-23.05; + nixpkgs-23_11.url = github:NixOS/nixpkgs/nixos-23.11; nixpkgs-unstable.url = github:NixOS/nixpkgs; agenix.url = github:ryantm/agenix; sso-test.url = github:UM-LPM/sso-test; @@ -10,8 +11,8 @@ gc.url = github:Mir1001/gc_mv_backend; }; - outputs = {self, nixpkgs, nixpkgs-unstable, agenix, sso-test, collab, collab-dev, login, gc, ...}@inputs: - let + outputs = {self, nixpkgs, nixpkgs-23_11, nixpkgs-unstable, agenix, sso-test, collab, collab-dev, login, gc, ...}@inputs: + let pkgs = import nixpkgs { system = "x86_64-linux"; config.allowUnfree = true; @@ -19,6 +20,10 @@ "nodejs-16.20.2" ]; }; + pkgs-23_11 = import nixpkgs-23_11 { + system = "x86_64-linux"; + config.allowUnfree = true; + }; pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; config.allowUnfree = true; @@ -43,7 +48,7 @@ ./modules/secrets.nix ./machines/${hostname}/configuration.nix ]; - specialArgs = {inherit inputs pkgs-unstable;}; + specialArgs = {inherit inputs pkgs-unstable pkgs-23_11;}; }; in { "minimal" = mkSystem "minimal.l" []; diff --git a/machines/runner1.l/configuration.nix b/machines/runner1.l/configuration.nix index 9329b2b..3be2f3d 100644 --- a/machines/runner1.l/configuration.nix +++ b/machines/runner1.l/configuration.nix @@ -1,6 +1,6 @@ -{config, pkgs, pkgs-unstable, ...}: +{config, pkgs, pkgs-unstable, pkgs-23_11, ...}: let - github-runner = pkgs-unstable.github-runner; #.override { nodeRuntimes = [ "node16" "node20" ]; }; + github-runner = pkgs-23_11.github-runner; #.override { nodeRuntimes = [ "node16" "node20" ]; }; in { imports = [