hans/Fediversity
1
0
Fork 0
forked from Fediversity/Fediversity
Code Pull requests Activity

Move Nix options to common

Browse source
This commit is contained in:
Nicolas Jeannerod 2024-12-16 12:57:02 +01:00
parent 8b9e9e96ba
commit 732760bc0c
Signed by untrusted user: Niols
GPG key ID: 35DB9EC8886E1CB8
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
infra/common/default.nix
View file

@ -16,6 +16,13 @@ in
system.stateVersion = "24.05"; # do not change system.stateVersion = "24.05"; # do not change
nixpkgs.hostPlatform = mkDefault "x86_64-linux"; nixpkgs.hostPlatform = mkDefault "x86_64-linux";
## This is just nice to have, but it is also particularly important for the
## Forgejo CI runners because the Nix configuration in the actions is directly
## taken from here.
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
(pkgs.vim_configurable.customize { (pkgs.vim_configurable.customize {
name = "vim"; name = "vim";

6
infra/vm02179/gitea-runner.nix
View file

@ -33,10 +33,4 @@
}; };
}; };
}; };
## The Nix configuration of the system influences the Nix configuration
## in the workflow, and our workflows are often flake-based.
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
} }

6
infra/vm02186/gitea-runner.nix
View file

@ -40,10 +40,4 @@
## For the Docker mode of the runner. ## For the Docker mode of the runner.
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
## The Nix configuration of the system influences the Nix configuration
## in the workflow, and our workflows are often flake-based.
nix.extraOptions = ''
experimental-features = nix-command flakes
'';
} }