Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 20 insertions, 15 deletions

diff --git a/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix b/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix
index ec27aa5e37ae..dda52e8ebba8 100644
--- a/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix
+++ b/nixpkgs/pkgs/development/python-modules/bayesian-optimization/default.nix
@@ -4,37 +4,42 @@
 , fetchFromGitHub
 , scikit-learn
 , scipy
-, pytest
-, isPy27
+, colorama
+, pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "bayesian-optimization";
-  version = "1.2.0";
-  disabled = isPy27;
+  version = "1.4.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
-    owner = "fmfn";
+    owner = "bayesian-optimization";
     repo = "BayesianOptimization";
-    rev = version;
-    sha256 = "01mg9npiqh1qmq5ldnbpjmr8qkiw827msiv3crpkhbj4bdzasbfm";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-Bp/ZhVSW5lTGwnsd/doOXu++Gxw/51owCfMm96Qmgd4=";
   };
 
   propagatedBuildInputs = [
     scikit-learn
     scipy
+    colorama
   ];
 
-  checkInputs = [ pytest ];
-  checkPhase = ''
-    # New sklearn broke one test: https://github.com/fmfn/BayesianOptimization/issues/243
-    pytest tests -k "not test_suggest_with_one_observation"
-  '';
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "bayes_opt" ];
 
   meta = with lib; {
-    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
-    description = "A Python implementation of global optimization with gaussian processes";
-    homepage = "https://github.com/fmfn/BayesianOptimization";
+    broken = stdenv.isLinux && stdenv.isAarch64;
+    description = ''
+      A Python implementation of global optimization with gaussian processes
+    '';
+    homepage = "https://github.com/bayesian-optimization/BayesianOptimization";
+    changelog = "https://github.com/bayesian-optimization/BayesianOptimization/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = [ maintainers.juliendehos ];
   };