revert default providers to 'wheel,sdist,nixpkgs'

This commit is contained in:
DavHau 2021-06-10 00:07:19 +07:00
parent f8b1f5f107
commit 27491cdf25
4 changed files with 15 additions and 5 deletions

View file

@ -0,0 +1 @@
conda-beta

View file

@ -75,6 +75,10 @@ let
in in
if missingChannels != [] then if missingChannels != [] then
throw "Conda channels [${toString missingChannels}] are unknown. Use 'condaChannelsExtra' to make them available" throw "Conda channels [${toString missingChannels}] are unknown. Use 'condaChannelsExtra' to make them available"
else else let
channelNames = (attrNames allCondaChannels); in
if channelNames != [] then
trace "using conda channels: ${toString (concatStringsSep ", " (attrNames allCondaChannels))}" trace "using conda channels: ${toString (concatStringsSep ", " (attrNames allCondaChannels))}"
{ inherit condaChannelsJson; } { inherit condaChannelsJson; }
else
{ inherit condaChannelsJson; }

View file

@ -1,4 +1,4 @@
_default = "conda,wheel,sdist,nixpkgs" _default = "wheel,sdist,nixpkgs"
gdal = "nixpkgs" gdal = "nixpkgs"
pip = "nixpkgs,sdist" pip = "nixpkgs,sdist"

View file

@ -6,9 +6,14 @@ let
import file ({ import file ({
inherit mach-nix; inherit mach-nix;
} // (if conda then (rec { } // (if conda then (rec {
baseArgsMkPython = { _provierDefaults = (fromTOML (readFile ./mach_nix/provider_defaults.toml) // {
_default = "conda,wheel,sdist,nixpkgs";
}); };
baseArgsBuildPythonPackage = baseArgsMkPython;
}) else {
baseArgsMkPython = { _provierDefaults = fromTOML (readFile ./mach_nix/provider_defaults.toml); }; baseArgsMkPython = { _provierDefaults = fromTOML (readFile ./mach_nix/provider_defaults.toml); };
baseArgsBuildPythonPackage = baseArgsMkPython; baseArgsBuildPythonPackage = baseArgsMkPython;
}) else {})); }));
in in
flatten (map (file: makeTests) [ flatten (map (file: makeTests) [
./test_alias_dateutil.nix ./test_alias_dateutil.nix