From 128389b60c801aa5cd7f2ca9e2ef28d9a1784f5e Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 3 Aug 2016 11:53:09 +0900 Subject: hydra-module: honor user and group ids --- nixos/modules/services/continuous-integration/hydra/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index c8edfaf18537..3eed9ba89821 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -193,7 +193,9 @@ in config = mkIf cfg.enable { - users.extraGroups.hydra = { }; + users.extraGroups.hydra = { + gid = config.ids.gids.hydra; + }; users.extraUsers.hydra = { description = "Hydra"; @@ -201,6 +203,7 @@ in createHome = true; home = baseDir; useDefaultShell = true; + uid = config.ids.uids.hydra; }; users.extraUsers.hydra-queue-runner = @@ -208,12 +211,14 @@ in group = "hydra"; useDefaultShell = true; home = "${baseDir}/queue-runner"; # really only to keep SSH happy + uid = config.ids.uids.hydra-queue-runner; }; users.extraUsers.hydra-www = { description = "Hydra web server"; group = "hydra"; useDefaultShell = true; + uid = config.ids.uids.hydra-www; }; nix.trustedUsers = [ "hydra-queue-runner" ]; -- cgit 1.4.1 From 338c425e081ef078749c5a68fa880347ac0bade6 Mon Sep 17 00:00:00 2001 From: Eric Sagnes Date: Wed, 3 Aug 2016 11:56:53 +0900 Subject: hydra-module: add default to buildMachinesFiles --- nixos/modules/services/continuous-integration/hydra/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixos') diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 3eed9ba89821..b1b3404add09 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -166,7 +166,7 @@ in buildMachinesFiles = mkOption { type = types.listOf types.path; - default = []; + default = [ "/etc/nix/machines" ]; example = [ "/etc/nix/machines" "/var/lib/hydra/provisioner/machines" ]; description = "List of files containing build machines."; }; -- cgit 1.4.1 From b4821ece01818a4702b332e9bc54b093c50d5d7a Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Sun, 21 Aug 2016 11:58:14 +0200 Subject: nixos: blacklist radeon module if using amdgpu --- nixos/modules/hardware/video/amdgpu.nix | 9 +++++++++ nixos/modules/module-list.nix | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/hardware/video/amdgpu.nix (limited to 'nixos') diff --git a/nixos/modules/hardware/video/amdgpu.nix b/nixos/modules/hardware/video/amdgpu.nix new file mode 100644 index 000000000000..42fc8fa362de --- /dev/null +++ b/nixos/modules/hardware/video/amdgpu.nix @@ -0,0 +1,9 @@ +{ config, lib, ... }: + +with lib; +{ + config = mkIf (elem "amdgpu" config.services.xserver.videoDrivers) { + boot.blacklistedKernelModules = [ "radeon" ]; + }; +} + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 41615a8a9dc3..eb89ff83e2ce 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -37,9 +37,10 @@ ./hardware/network/rtl8192c.nix ./hardware/opengl.nix ./hardware/pcmcia.nix + ./hardware/video/amdgpu.nix + ./hardware/video/ati.nix ./hardware/video/bumblebee.nix ./hardware/video/nvidia.nix - ./hardware/video/ati.nix ./hardware/video/webcam/facetimehd.nix ./i18n/input-method/default.nix ./i18n/input-method/fcitx.nix -- cgit 1.4.1