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

nixpkgs-update updates

Browse source
This commit is contained in:
Ryan Mulligan 2022-09-07 15:53:26 -07:00
parent 728948a801
commit 16c3284937
2 changed files with 10 additions and 15 deletions

19
build02/nixpkgs-update.nix
View file

@ -22,7 +22,7 @@ let
nixpkgs-update-pypi-releases' = "${nixpkgs-update-pypi-releases}/main.py"; nixpkgs-update-pypi-releases' = "${nixpkgs-update-pypi-releases}/main.py";
mkWorker = name: { mkWorker = name: {
after = [ "network.target" ]; after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "nixpkgs-update ${name} service"; description = "nixpkgs-update ${name} service";
enable = true; enable = true;
@ -30,7 +30,7 @@ let
path = nixpkgsUpdateSystemDependencies; path = nixpkgsUpdateSystemDependencies;
environment.XDG_CONFIG_HOME = "/var/lib/nixpkgs-update/worker"; environment.XDG_CONFIG_HOME = "/var/lib/nixpkgs-update/worker";
environment.XDG_CACHE_HOME = "/var/cache/nixpkgs-update/worker"; environment.XDG_CACHE_HOME = "/var/cache/nixpkgs-update/worker";
environment.XDG_RUNTIME_DIR = "/run/nixpkgs-update/worker"; # for nix-update update scripts environment.XDG_RUNTIME_DIR = "/run/nixpkgs-update-worker"; # for nix-update update scripts
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
@ -45,7 +45,7 @@ let
CacheDirectoryMode = "700"; CacheDirectoryMode = "700";
LogsDirectory = "nixpkgs-update/"; LogsDirectory = "nixpkgs-update/";
LogsDirectoryMode = "755"; LogsDirectoryMode = "755";
RuntimeDirectory = "nixpkgs-update/worker"; RuntimeDirectory = "nixpkgs-update-worker";
RuntimeDirectoryMode = "700"; RuntimeDirectoryMode = "700";
StandardOutput = "journal"; StandardOutput = "journal";
}; };
@ -70,7 +70,7 @@ let
}; };
mkFetcher = cmd: { mkFetcher = cmd: {
after = [ "network.target" ]; after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
path = nixpkgsUpdateSystemDependencies; path = nixpkgsUpdateSystemDependencies;
# API_TOKEN is used by nixpkgs-update-github-releases # API_TOKEN is used by nixpkgs-update-github-releases
@ -89,6 +89,8 @@ let
WorkingDirectory = "/var/lib/nixpkgs-update/"; WorkingDirectory = "/var/lib/nixpkgs-update/";
StateDirectory = "nixpkgs-update"; StateDirectory = "nixpkgs-update";
StateDirectoryMode = "700"; StateDirectoryMode = "700";
CacheDirectory = "nixpkgs-update/worker";
CacheDirectoryMode = "700";
}; };
script = '' script = ''
pipe=/var/lib/nixpkgs-update/fifo pipe=/var/lib/nixpkgs-update/fifo
@ -113,14 +115,13 @@ in
systemd.services.nixpkgs-update-delete-done = { systemd.services.nixpkgs-update-delete-done = {
startAt = "daily"; startAt = "daily";
after = [ "network.target" ]; after = [ "network-online.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "nixpkgs-update delete done branches"; description = "nixpkgs-update delete done branches";
restartIfChanged = true; restartIfChanged = true;
path = nixpkgsUpdateSystemDependencies; path = nixpkgsUpdateSystemDependencies;
environment.XDG_CONFIG_HOME = "/var/lib/nixpkgs-update/worker"; environment.XDG_CONFIG_HOME = "/var/lib/nixpkgs-update/worker";
environment.XDG_CACHE_HOME = "/var/cache/nixpkgs-update/worker"; environment.XDG_CACHE_HOME = "/var/cache/nixpkgs-update/worker";
environment.XDG_RUNTIME_DIR = "/run/nixpkgs-update/worker"; # for nix-update update scripts
serviceConfig = { serviceConfig = {
Type = "simple"; Type = "simple";
@ -131,12 +132,9 @@ in
WorkingDirectory = "/var/lib/nixpkgs-update/worker"; WorkingDirectory = "/var/lib/nixpkgs-update/worker";
StateDirectory = "nixpkgs-update/worker"; StateDirectory = "nixpkgs-update/worker";
StateDirectoryMode = "700"; StateDirectoryMode = "700";
CacheDirectory = "nixpkgs-update/worker";
CacheDirectoryMode = "700"; CacheDirectoryMode = "700";
LogsDirectory = "nixpkgs-update/"; LogsDirectory = "nixpkgs-update/";
LogsDirectoryMode = "755"; LogsDirectoryMode = "755";
RuntimeDirectory = "nixpkgs-update/worker";
RuntimeDirectoryMode = "700";
StandardOutput = "journal"; StandardOutput = "journal";
}; };
@ -148,7 +146,6 @@ in
systemd.services.nixpkgs-update-fetch-pypi = mkFetcher "grep -rl $XDG_CACHE_HOME/nixpkgs -e buildPython | grep default | ${nixpkgs-update-pypi-releases'} --nixpkgs=/var/cache/nixpkgs-update/fetcher/nixpkgs"; systemd.services.nixpkgs-update-fetch-pypi = mkFetcher "grep -rl $XDG_CACHE_HOME/nixpkgs -e buildPython | grep default | ${nixpkgs-update-pypi-releases'} --nixpkgs=/var/cache/nixpkgs-update/fetcher/nixpkgs";
systemd.services.nixpkgs-update-fetch-github = mkFetcher nixpkgs-update-github-releases'; systemd.services.nixpkgs-update-fetch-github = mkFetcher nixpkgs-update-github-releases';
systemd.services.nixpkgs-update-worker1 = mkWorker "worker1"; systemd.services.nixpkgs-update-worker1 = mkWorker "worker1";
systemd.services.nixpkgs-update-worker2 = mkWorker "worker2"; systemd.services.nixpkgs-update-worker2 = mkWorker "worker2";
systemd.services.nixpkgs-update-worker3 = mkWorker "worker3"; systemd.services.nixpkgs-update-worker3 = mkWorker "worker3";
@ -160,8 +157,6 @@ in
"e /var/cache/nixpkgs-update/worker/nixpkgs-review - - - 1d -" "e /var/cache/nixpkgs-update/worker/nixpkgs-review - - - 1d -"
"d /run/nixpkgs-update/worker - r-ryantm r-ryantm - -"
"L+ /var/lib/nixpkgs-update/bin/nixpkgs-update - - - - ${nixpkgs-update.defaultPackage.${pkgs.system}}/bin/nixpkgs-update" "L+ /var/lib/nixpkgs-update/bin/nixpkgs-update - - - - ${nixpkgs-update.defaultPackage.${pkgs.system}}/bin/nixpkgs-update"
"L+ /var/lib/nixpkgs-update/worker/github_token.txt - - - - ${config.sops.secrets.github-r-ryantm-token.path}" "L+ /var/lib/nixpkgs-update/worker/github_token.txt - - - - ${config.sops.secrets.github-r-ryantm-token.path}"
"L+ /var/lib/nixpkgs-update/worker/cachix/cachix.dhall - - - - ${config.sops.secrets.nix-community-cachix.path}" "L+ /var/lib/nixpkgs-update/worker/cachix/cachix.dhall - - - - ${config.sops.secrets.nix-community-cachix.path}"

6
flake.lock generated
View file

@ -322,11 +322,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1662248049, "lastModified": 1662585274,
"narHash": "sha256-AtbEblrjEPpXmiDAPxgMkxZGZiYgXDP8E7jvLvL3cVk=", "narHash": "sha256-o60PKQAVa/FwDjw+fxDo2cfArmuBhsvrsEIXfcxv7dU=",
"owner": "ryantm", "owner": "ryantm",
"repo": "nixpkgs-update", "repo": "nixpkgs-update",
"rev": "f2e818f559c58a135dd15e762b515e475f490a6a", "rev": "33366746fa259883add415234e5cafa5f181ae39",
"type": "github" "type": "github"
}, },
"original": { "original": {