From d877c9b39c7cba8d9f103740127e866c5f504a57 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 31 Jan 2021 17:35:18 -0500 Subject: [PATCH 1/2] nixos/buildbot: add lopsided98 as maintainer --- .../modules/services/continuous-integration/buildbot/master.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index d30d94c53cc3..af3f5f0ea1e1 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -283,5 +283,5 @@ in { '') ]; - meta.maintainers = with lib.maintainers; [ nand0p mic92 ]; + meta.maintainers = with lib.maintainers; [ nand0p mic92 lopsided98 ]; } From 945a461ac217bff5e679aa14620358034796f7b4 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Sun, 31 Jan 2021 17:36:28 -0500 Subject: [PATCH 2/2] nixos/buildbot: fix type for pythonPackages The pythonPackages option is a function that returns a list of packages, but the type was specified as just a list of packages. --- .../modules/services/continuous-integration/buildbot/master.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/buildbot/master.nix b/nixos/modules/services/continuous-integration/buildbot/master.nix index af3f5f0ea1e1..a49f5f8100dc 100644 --- a/nixos/modules/services/continuous-integration/buildbot/master.nix +++ b/nixos/modules/services/continuous-integration/buildbot/master.nix @@ -223,7 +223,7 @@ in { }; pythonPackages = mkOption { - type = types.listOf types.package; + type = types.functionTo (types.listOf types.package); default = pythonPackages: with pythonPackages; [ ]; defaultText = "pythonPackages: with pythonPackages; [ ]"; description = "Packages to add the to the PYTHONPATH of the buildbot process.";