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

Remove references to cachix, stop having r-ryantm be a nix trusted user

Browse source 
Cachix is now being handled by the post build hook using the
nix-communit Cachix, and I don't remember why r-ryantm had to be a nix
trusted user, so lets turn that off and see if it works.
This commit is contained in:
zimbatm 2020-08-07 19:59:39 +02:00 • committed by Ryan Mulligan
parent ead12a2499
commit de0113295d
1 changed files with 3 additions and 8 deletions

11
build01/nixpkgs-update.nix
View file

@ -11,7 +11,6 @@ let
nixpkgsUpdateSystemDependencies = with pkgs; [ nixpkgsUpdateSystemDependencies = with pkgs; [
nix # for nix-shell used by python packges to update fetchers nix # for nix-shell used by python packges to update fetchers
gnugrep gnugrep
cachix
curl curl
]; ];
@ -33,7 +32,6 @@ let
}; };
in in
{ {
users.users.r-ryantm.packages = [ pkgs.cachix ];
users.groups.r-ryantm = {}; users.groups.r-ryantm = {};
users.users.r-ryantm = { users.users.r-ryantm = {
useDefaultShell = true; useDefaultShell = true;
@ -41,9 +39,6 @@ in
uid = userLib.mkUid "rrtm"; uid = userLib.mkUid "rrtm";
extraGroups = [ "r-ryantm" ]; extraGroups = [ "r-ryantm" ];
}; };
nix.trustedUsers = [
"r-ryantm"
];
systemd.services.nixpkgs-update = { systemd.services.nixpkgs-update = {
description = "nixpkgs-update service"; description = "nixpkgs-update service";
@ -64,13 +59,13 @@ in
${nixpkgs-update-bin} delete-done --delete ${nixpkgs-update-bin} delete-done --delete
grep -rl $XDG_CACHE_HOME/nixpkgs -e buildPython | grep default | \ grep -rl $XDG_CACHE_HOME/nixpkgs -e buildPython | grep default | \
${nixpkgs-update-pypi-releases} > /var/lib/nixpkgs-update/packages-to-update.txt ${nixpkgs-update-pypi-releases} > /var/lib/nixpkgs-update/packages-to-update.txt
${nixpkgs-update-bin} update-list --pr --cve --cachix --outpaths --nixpkgs-review ${nixpkgs-update-bin} update-list --pr --cve --outpaths --nixpkgs-review
${nixpkgs-update-bin} delete-done --delete ${nixpkgs-update-bin} delete-done --delete
${nixpkgs-update-github-releases} > /var/lib/nixpkgs-update/packages-to-update.txt ${nixpkgs-update-github-releases} > /var/lib/nixpkgs-update/packages-to-update.txt
${nixpkgs-update-bin} update-list --pr --cve --cachix --outpaths --nixpkgs-review ${nixpkgs-update-bin} update-list --pr --cve --outpaths --nixpkgs-review
${nixpkgs-update-bin} delete-done --delete ${nixpkgs-update-bin} delete-done --delete
${nixpkgs-update-bin} fetch-repology > /var/lib/nixpkgs-update/packages-to-update.txt ${nixpkgs-update-bin} fetch-repology > /var/lib/nixpkgs-update/packages-to-update.txt
${nixpkgs-update-bin} update-list --pr --cve --cachix --outpaths --nixpkgs-review ${nixpkgs-update-bin} update-list --pr --cve --outpaths --nixpkgs-review
''; '';
}; };