From 65be8f20e0508cb8f81a7b42a240ebb8a03d8a93 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 13 Apr 2021 12:21:42 +0200 Subject: chore(nixpkgs): Bump channels to 2021-05-25 * users/grfn/system/home/yeren: remove obsolete awscli2 overrides * ops: make new isSystemUser || isNormalUser assertion happy * users/grfn/system/system/mugwump: make buildkite agents system users * users/tazjin/nixos/camden: set isSystemUser = true for git * users/tazjin/emacs: Remove missing & broken packages * third_party/openldap: remove, as the argon2 module is now enabled upstream * third_party/gerrit_plugins: Pinned new unstable hashes * third_party/nix, third_party/grpc: Disabled CI as these are broken * third_party/overlays/emacs: Bumped version to stay in sync with channel * third_party/buzz: Update LIBCLANG_PATH to reference libclang.lib, since libclang's default output no longer contains libclang.so * users/grfn/system/home: Install julia-stable instead of julia (which aliases to julia-lts), as the latter depends on an insecure version of libgit Change-Id: Iff33b0ecb0ef07a82d1de35e23c40d2f4bf0f8ed Reviewed-on: https://cl.tvl.fyi/c/depot/+/3001 Tested-by: BuildkiteCI Reviewed-by: sterni Reviewed-by: grfn --- users/grfn/system/home/machines/yeren.nix | 11 +---------- users/grfn/system/home/modules/development.nix | 2 +- users/grfn/system/system/machines/mugwump.nix | 10 ++++++++-- 3 files changed, 10 insertions(+), 13 deletions(-) (limited to 'users/grfn/system') diff --git a/users/grfn/system/home/machines/yeren.nix b/users/grfn/system/home/machines/yeren.nix index 504a382c20..67c3968ae4 100644 --- a/users/grfn/system/home/machines/yeren.nix +++ b/users/grfn/system/home/machines/yeren.nix @@ -39,16 +39,7 @@ in steam - (awscli2.overridePythonAttrs (oldAttrs: { - postPatch = '' - substituteInPlace setup.py \ - --replace 'colorama>=0.2.5,<0.4.4' 'colorama' \ - --replace 'wcwidth<0.2.0' 'colorama' \ - --replace 'cryptography>=2.8.0,<=2.9.0' 'cryptography' \ - --replace 'docutils>=0.10,<0.16' 'docutils' \ - --replace 'ruamel.yaml>=0.15.0,<0.16.0' 'ruamel.yaml' - ''; - })) + awscli2 ]; systemd.user.services.laptop-keyboard = { diff --git a/users/grfn/system/home/modules/development.nix b/users/grfn/system/home/modules/development.nix index 43bb7a79a2..a79f5b9875 100644 --- a/users/grfn/system/home/modules/development.nix +++ b/users/grfn/system/home/modules/development.nix @@ -76,7 +76,7 @@ with lib; nodePackages.prettier ] ++ optionals (stdenv.isLinux) [ - julia + julia-stable valgrind ]; diff --git a/users/grfn/system/system/machines/mugwump.nix b/users/grfn/system/system/machines/mugwump.nix index 77c4dda9a5..f9b6e0a1da 100644 --- a/users/grfn/system/system/machines/mugwump.nix +++ b/users/grfn/system/system/machines/mugwump.nix @@ -274,6 +274,12 @@ with lib; }; }) (range 1 1)); - users.users."buildkite-agent-mugwump-1".extraGroups = [ "docker" ]; - users.users."buildkite-agent-mugwump-2".extraGroups = [ "docker" ]; + users.users."buildkite-agent-mugwump-1" = { + isSystemUser = true; + extraGroups = [ "docker" ]; + }; + users.users."buildkite-agent-mugwump-2" = { + isSystemUser = true; + extraGroups = [ "docker" ]; + }; } -- cgit 1.4.1