sercanto/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

switch to nixpkgs cachix again

Browse source
This commit is contained in:
Jörg Thalheim 2022-01-29 11:13:57 +01:00
parent 48a7aa5866
commit 05f8532173
3 changed files with 2 additions and 19 deletions

1
nix/overlays.nix
View file

@ -20,7 +20,6 @@ let
in in
[ [
(self: super: { sources = import ./sources.nix; }) (self: super: { sources = import ./sources.nix; })
(self: super: { cachix = import super.sources.cachix {}; })
(self: super: { nix-community-infra = nix-community-infra super; }) (self: super: { nix-community-infra = nix-community-infra super; })
(self: super: (import "${super.sources.hercules-ci-effects}/overlay.nix") self super) (self: super: (import "${super.sources.hercules-ci-effects}/overlay.nix") self super)
] ]

12
nix/sources.json
View file

@ -1,16 +1,4 @@
{ {
"cachix": {
"branch": "master",
"description": "Command line client for Nix binary cache hosting:",
"homepage": "https://cachix.org",
"owner": "cachix",
"repo": "cachix",
"rev": "ec5904b25b74dd1b1cf7db0874f85a9169b388aa",
"sha256": "0s51i7mpz8sk63xs31lkzscca0j81rhzikrk61cnrlqa7dhy8nmw",
"type": "tarball",
"url": "https://github.com/cachix/cachix/archive/ec5904b25b74dd1b1cf7db0874f85a9169b388aa.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"hercules-ci-effects": { "hercules-ci-effects": {
"branch": "master", "branch": "master",
"description": "Expressions to change the world", "description": "Expressions to change the world",

8
roles/cachix-deploy/default.nix
View file

@ -1,9 +1,7 @@
{ config, pkgs, ... }: { { config, pkgs, ... }: {
sops.secrets.cachix-agent-token.sopsFile = ./secrets.yaml; sops.secrets.cachix-agent-token.sopsFile = ./secrets.yaml;
systemd.services.cachix-deploy-agent = let systemd.services.cachix-deploy-agent = {
sources = import ../../nix/sources.nix {};
in {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = [ config.nix.package ]; path = [ config.nix.package ];
restartIfChanged = false; restartIfChanged = false;
@ -11,9 +9,7 @@
Restart = "on-failure"; Restart = "on-failure";
Environment = "USER=root"; Environment = "USER=root";
EnvironmentFile = config.sops.secrets.cachix-agent-token.path; EnvironmentFile = config.sops.secrets.cachix-agent-token.path;
ExecStart = "${import sources.cachix { ExecStart = "${pkgs.cachix}/bin/cachix deploy agent ${config.networking.hostName}";
inherit (pkgs) system;
}}/bin/cachix deploy agent ${config.networking.hostName}";
}; };
}; };
} }