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/all-packages.nix
+7
View File
@@ -11173,6 +11173,13 @@ in
julia-stable = julia_15;
julia = julia-lts;
julia_10-bin = callPackage ../development/compilers/julia/1.0-bin.nix { };
julia_16-bin = callPackage ../development/compilers/julia/1.6-bin.nix { };
julia-lts-bin = julia_10-bin;
julia-stable-bin = julia_16-bin;
julia-bin = julia-lts-bin;
jwasm = callPackage ../development/compilers/jwasm { };
knightos-genkfs = callPackage ../development/tools/knightos/genkfs { };
pkgs/top-level/coq-packages.nix
+2
View File
@@ -13,6 +13,7 @@ let
contribs = recurseIntoAttrs
(callPackage ../development/coq-modules/contribs {});
aac-tactics = callPackage ../development/coq-modules/aac-tactics {};
autosubst = callPackage ../development/coq-modules/autosubst {};
bignums = if lib.versionAtLeast coq.coq-version "8.6"
then callPackage ../development/coq-modules/bignums {}
@@ -68,6 +69,7 @@ let
paramcoq = callPackage ../development/coq-modules/paramcoq {};
pocklington = callPackage ../development/coq-modules/pocklington {};
QuickChick = callPackage ../development/coq-modules/QuickChick {};
relation-algebra = callPackage ../development/coq-modules/relation-algebra {};
simple-io = callPackage ../development/coq-modules/simple-io { };
stdpp = callPackage ../development/coq-modules/stdpp { };
StructTact = callPackage ../development/coq-modules/StructTact {};
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 { };
pkgs/top-level/python2-packages.nix
+1 -1
View File
@@ -524,7 +524,7 @@ with self; with super; {
scandir = callPackage ../development/python-modules/scandir { };
scikitlearn = callPackage ../development/python-modules/scikitlearn/0.20.nix {
scikit-learn = callPackage ../development/python-modules/scikit-learn/0.20.nix {
inherit (pkgs) gfortran glibcLocales;
};