public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into staging-next

Browse Source 
Conflicts:
	pkgs/development/tools/rust/cargo-cache/default.nix
	pkgs/development/tools/rust/cargo-embed/default.nix
	pkgs/development/tools/rust/cargo-flash/default.nix
	pkgs/servers/nosql/influxdb2/default.nix
This commit is contained in:
Jonathan Ringer
2021-05-17 07:01:38 -07:00
parent 3ff6965554 631cbc3de7
commit c227fb4b17
113 changed files with 1041 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+3 -1
View File
@@ -7382,10 +7382,12 @@ in {
scikitimage = callPackage ../development/python-modules/scikit-image { };
scikitlearn = callPackage ../development/python-modules/scikitlearn {
scikit-learn = callPackage ../development/python-modules/scikit-learn {
inherit (pkgs) gfortran glibcLocales;
};
scikitlearn = self.scikit-learn;
scikit-optimize = callPackage ../development/python-modules/scikit-optimize { };
scikits-odes = callPackage ../development/python-modules/scikits-odes { };