Skip to content

Commit

Permalink
Fix GitHub runner
Browse files Browse the repository at this point in the history
  • Loading branch information
brokenpylons committed Feb 7, 2024
1 parent 0aef093 commit 3835477
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 5 deletions.
17 changes: 17 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 8 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -10,15 +11,19 @@
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;
config.permittedInsecurePackages = [
"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;
Expand All @@ -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" [];
Expand Down
4 changes: 2 additions & 2 deletions machines/runner1.l/configuration.nix
Original file line number Diff line number Diff line change
@@ -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 = [
Expand Down

0 comments on commit 3835477

Please sign in to comment.