Commit graph

500 commits

Author SHA1 Message Date
DavHau
42bc08f8f9 move flake.lock to mach_nix dir and symlink 2020-11-27 12:41:22 +07:00
DavHau
071458ecae Merge branch 'master' into conda-beta
# Conflicts:
#	Readme.md
#	examples.md
#	mach_nix/VERSION
2020-11-27 01:57:03 +07:00
DavHau
84383f85ae version 3.1.0 2020-11-27 01:08:36 +07:00
DavHau
82add91944 Revert "add hint for experimental cmdline interface"
This reverts commit e3ea3ace
2020-11-25 16:05:47 +07:00
DavHau
8f7bebede1 Merge branch 'master' into conda-beta
# Conflicts:
#	default.nix
#	mach_nix/nix/NIXPKGS.json
#	mach_nix/nix/PYPI_DEPS_DB.json
#	mach_nix/nix/compileOverrides.nix
#	mach_nix/run.py
#	pypi-crawlers/nix/crawler/configuration.nix
2020-11-25 15:40:06 +07:00
DavHau
c00418c4a7 use inputs from flake.lock also in non-flake mode 2020-11-25 15:27:46 +07:00
DavHau
28800e47ef add library functions to flakes 2020-11-25 14:09:40 +07:00
DavHau
c3f99612a8 Merge remote-tracking branch 'nat543207/flake-compat' 2020-11-25 13:47:11 +07:00
DavHau
fb4940f722 Merge branch 'flake.nix' 2020-11-25 11:26:25 +07:00
DavHau
1adefb52af update version to conda-beta 2020-11-24 22:41:01 +07:00
DavHau
88300d4b5d fix: match behavior of cmdline api and nix api 2020-11-24 16:43:41 +07:00
DavHau
2614fea295 fix: match behavior of cmdline api and nix api 2020-11-24 16:43:26 +07:00
DavHau
f1b3d620e5 update index for examples.md 2020-11-23 15:11:00 +07:00
DavHau
0d6f1f218a add example for jupyterWith 2020-11-23 15:09:14 +07:00
DavHau
300b74041d fix: clear provider defaults if environment.yml is loaded 2020-11-23 01:14:30 +07:00
DavHau
ea82166c7f clear provider defaults if environment.yml is loaded 2020-11-23 01:00:09 +07:00
DavHau
bbe8558348 update readme 2020-11-21 14:21:48 +07:00
DavHau
6d6d252814 Add beta version hint 2020-11-21 13:43:35 +07:00
DavHau
e365b8582f fix version bug and requirements parsing 2020-11-21 13:34:51 +07:00
DavHau
e3ea3aceed add hint for experimental cmdline interface 2020-11-21 10:57:08 +07:00
DavHau
26829fc9f4 fix: strip requirements lines before parsing 2020-11-21 10:44:21 +07:00
DavHau
4d5752d973 update readme and examples for conda-beta 2020-11-21 01:36:33 +07:00
DavHau
fe7c806088 fix requirements parsing 2020-11-21 01:23:44 +07:00
DavHau
e7b7212ed8 filter out semaphors 2020-11-21 00:38:51 +07:00
DavHau
bf6cf8c388 fix index hash 2020-11-21 00:19:22 +07:00
DavHau
3ff3501551 reimplement requirement and version parsing 2020-11-21 00:08:20 +07:00
DavHau
cb04f10167 update providers in readme 2020-11-20 10:50:25 +07:00
DavHau
f69e56c381 conda: only ignore simple builds during environment.yml parsing 2020-11-20 10:50:12 +07:00
DavHau
ce9dc7cf66 Merge branch 'master' into conda 2020-11-19 15:19:46 +07:00
DavHau
d4f4294037 cleanup 2020-11-19 12:16:04 +07:00
DavHau
90c4f27e86 move nixpkgs deps into dir with license 2020-11-19 11:15:03 +07:00
DavHau
bd3b69eef0 symlink conda extra files to root dir 2020-11-19 01:09:56 +07:00
DavHau
5b30df403f automatically add extra conda channels to default providers 2020-11-17 23:13:21 +07:00
DavHau
21f195dec4 fix requirements parsing 2020-11-17 19:49:44 +07:00
DavHau
9f30dc7fdb fix readme underscore example 2020-11-17 18:31:27 +07:00
DavHau
55f0bfbc4e continue work on conda 2020-11-17 18:29:44 +07:00
DavHau
347ff93a78 Merge branch 'master' into conda 2020-10-29 10:36:24 +07:00
DavHau
22da85eae4 fix: docker images corrupt; stop using buildEnv for mkPython 2020-10-29 10:33:00 +07:00
Nathan Joss (nat543207)
a319310f42 Pass pkgs to extractor instead of referencing <nixpkgs> 2020-10-28 17:18:16 -07:00
DavHau
afff96fba5 fix typo in readme 2020-10-28 18:33:02 +07:00
DavHau
0c8479dd9c WIP: conda channels 2020-10-28 13:15:08 +07:00
DavHau
c7b31f3137 Merge branch 'master' into conda
# Conflicts:
#	mach_nix/data/nixpkgs.py
#	mach_nix/data/providers.py
#	mach_nix/tests/test_providers.py
2020-10-27 22:29:45 +07:00
DavHau
9aa62d0d03 version 3.0.2 2020-10-27 17:25:57 +07:00
DavHau
d3c862dc3e fix macos wheel selection unit tests 2020-10-27 17:16:41 +07:00
DavHau
e5940645de fix: prioritize nixpkgs attr with closest name, to prevent infinite recursion 2020-10-27 17:03:44 +07:00
DavHau
53c0ed1b96 add test for dateutil alias infinite recursion 2020-10-27 16:34:03 +07:00
DavHau
3acbfc2ebd remove some wheel types for macos 2020-10-27 10:19:44 +07:00
DavHau
9856807769 fix macos wheel selection and add tests for it 2020-10-27 09:47:02 +07:00
DavHau
678d716d1e WIP conda: add crawler for conda channels 2020-10-27 09:46:33 +07:00
DavHau
a039fc1a91 fix macos wheel selection and add tests for it 2020-10-27 09:44:59 +07:00