Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 90c0191735bc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ebf030b4ff2d
Choose a head ref
  • 3 commits
  • 1 file changed
  • 1 contributor

Commits on May 10, 2020

  1. python.pkgs.scikitlearn: add meta.changelog

    @timokau
    timokau committed May 10, 2020
    Copy the full SHA
    47548ca View commit details

  2. python.pkgs.scikitlearn: 0.21.3 -> 0.22.2.post1

    @timokau
    timokau committed May 10, 2020
    Copy the full SHA
    cd45ab0 View commit details

Commits on May 12, 2020

  1. Merge pull request #87527 from timokau/scikitlearn-0.22.2 

     python.pkgs.scikitlearn: 0.21.3 -> 0.22.2.post1
    @timokau
    timokau authored May 12, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ebf030b View commit details
Showing with 8 additions and 11 deletions.
  1. +8 −11 pkgs/development/python-modules/scikitlearn/default.nix
19 changes: 8 additions & 11 deletions pkgs/development/python-modules/scikitlearn/default.nix
View file
Original file line number Diff line number Diff line change
@@ -12,13 +12,13 @@

buildPythonPackage rec {
pname = "scikit-learn";
version = "0.21.3";
version = "0.22.2.post1";
# UnboundLocalError: local variable 'message' referenced before assignment
disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534

src = fetchPypi {
inherit pname version;
sha256 = "eb9b8ebf59eddd8b96366428238ab27d05a19e89c5516ce294abc35cea75d003";
sha256 = "0z81n13dxvd6qwq5lsnzw2machmxbirhdhr73v90fi55ic9qslsp";
};

buildInputs = [
@@ -41,15 +41,6 @@ buildPythonPackage rec {
];
checkInputs = [ pytest ];

patches = [
# Fixes tests by changing threshold of a test-case that broke
# with numpy versions >= 1.17. This should be removed for versions > 0.21.2.
( fetchpatch {
url = "https://github.com/scikit-learn/scikit-learn/commit/b730befc821caec5b984d9ff3aa7bc4bd7f4d9bb.patch";
sha256 = "0z36m05mv6d494qwq0688rgwa7c4bbnm5s2rcjlrp29fwn3fy1bv";
})
];

LC_ALL="en_US.UTF-8";

doCheck = !stdenv.isAarch64;
@@ -61,6 +52,12 @@ buildPythonPackage rec {

meta = with stdenv.lib; {
description = "A set of python modules for machine learning and data mining";
changelog = let
major = versions.major version;
minor = versions.minor version;
dashVer = replaceChars ["."] ["-"] version;
in
"https://scikit-learn.org/stable/whats_new/v${major}.${minor}.html#version-${dashVer}";
homepage = "https://scikit-learn.org";
license = licenses.bsd3;
maintainers = with maintainers; [ ];