Commit 9584ba7f authored by Jörg Thalheim's avatar Jörg Thalheim Committed by tomf
Browse files

nixos/buildbot: use python version used of the buildbot package 

Since the buildbot package can be overwritten, it can be build against a
different python version.
This pull request makes sure we don't use the wrong python version.
This makes using buildbot-nix easier for both nixpkgs unstable and
nixpkgs stable.
parent 0e21e868

nixos/modules/services/continuous-integration/buildbot/master.nix

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ let 
  cfg = config.services.buildbot-master;

  opt = options.services.buildbot-master;



  package = pkgs.python3.pkgs.toPythonModule cfg.package;

  package = cfg.package.python.pkgs.toPythonModule cfg.package;

  python = package.pythonModule;



  escapeStr = lib.escape [ "'" ];

pkgs/development/tools/continuous-integration/buildbot/master.nix

+1 −1
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ buildPythonApplication rec { 
  '';



  passthru = {

    inherit withPlugins;

    inherit withPlugins python;

    updateScript = ./update.sh;

  } // lib.optionalAttrs stdenv.hostPlatform.isLinux {

    tests = {