revert default providers to 'wheel,sdist,nixpkgs'
This commit is contained in:
parent
f8b1f5f107
commit
27491cdf25
4 changed files with 15 additions and 5 deletions
|
@ -0,0 +1 @@
|
|||
conda-beta
|
|
@ -75,6 +75,10 @@ let
|
|||
in
|
||||
if missingChannels != [] then
|
||||
throw "Conda channels [${toString missingChannels}] are unknown. Use 'condaChannelsExtra' to make them available"
|
||||
else
|
||||
trace "using conda channels: ${toString (concatStringsSep ", " (attrNames allCondaChannels))}"
|
||||
{ inherit condaChannelsJson; }
|
||||
else let
|
||||
channelNames = (attrNames allCondaChannels); in
|
||||
if channelNames != [] then
|
||||
trace "using conda channels: ${toString (concatStringsSep ", " (attrNames allCondaChannels))}"
|
||||
{ inherit condaChannelsJson; }
|
||||
else
|
||||
{ inherit condaChannelsJson; }
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
_default = "conda,wheel,sdist,nixpkgs"
|
||||
_default = "wheel,sdist,nixpkgs"
|
||||
|
||||
gdal = "nixpkgs"
|
||||
pip = "nixpkgs,sdist"
|
||||
|
|
|
@ -6,9 +6,14 @@ let
|
|||
import file ({
|
||||
inherit mach-nix;
|
||||
} // (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); };
|
||||
baseArgsBuildPythonPackage = baseArgsMkPython;
|
||||
}) else {}));
|
||||
}));
|
||||
in
|
||||
flatten (map (file: makeTests) [
|
||||
./test_alias_dateutil.nix
|
||||
|
|
Loading…
Reference in a new issue