Commit graph

75 commits

Author SHA1 Message Date
Tom Prince
c5eb17d47d Add a minimum version check. 2022-02-14 12:52:46 -07:00
DavHau
f18ed3bd78 fix mach-nix package 2021-06-09 16:21:31 +07:00
DavHau
65ea580168 improve requirements parsing 2021-06-06 14:57:04 +07:00
DavHau
c455ed8c56 Merge branch 'master' into conda-beta 2021-05-23 16:22:02 +07:00
DavHau
97d744887b simplify flakes cmdline api 2021-05-22 22:02:24 +07:00
DavHau
31a286bf2a Merge branch 'master' into conda-beta 2021-05-15 16:51:28 +07:00
DavHau
ae4fa305f4 fix: use buildPythonApplication to build mach-nix 2021-05-14 17:37:35 +07:00
DavHau
022740aefe fix, pypiData downloaded twice for flake; fix nix flake show 2021-03-29 12:48:40 +07:00
DavHau
55cda256cf throw on outdated data & add python arg 2021-03-26 22:17:44 +07:00
DavHau
afcfd0d15b add sdist output to flake 2021-03-12 12:37:07 +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
bf6cf8c388 fix index hash 2020-11-21 00:19:22 +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
55f0bfbc4e continue work on conda 2020-11-17 18:29:44 +07:00
DavHau
0c8479dd9c WIP: conda channels 2020-10-28 13:15:08 +07:00
DavHau
72157591ff fix wrong python passed to python-deps.nix 2020-10-14 00:35:26 +07:00
DavHau
abaf0355fe move python attribute to mach-nix import 2020-10-14 00:29:27 +07:00
DavHau
828ba2e772 throw error when pkgs / pypi_deps_db_xxx args are used with mkPython 2020-10-13 19:50:13 +07:00
DavHau
ad4662f03a fix mergeOverrides missing 2020-10-13 19:41:25 +07:00
DavHau
28860c5459 throw error when pkgs / pypi_deps_db_xxx args are used 2020-10-13 16:46:04 +07:00
DavHau
10bef3e57a refactor UI and file structure 2020-10-13 15:47:47 +07:00
DavHau
b122d76307 enable pytest 2020-10-12 13:45:34 +07:00
DavHau
a2b1ff0271
Merge pull request #147 from MIJOTHY/fix-string-requires
fix: allow for string setup/install_requires
2020-10-12 11:08:07 +07:00
DavHau
4ee7d647fb fix flakes and add tests for flakes 2020-10-12 10:54:19 +07:00
DavHau
44b29dfdbf allow rpy2 deps to be installed from wheel 2020-10-12 00:59:09 +07:00
DavHau
877d55d06d allow r packages to be passed via extra_pkgs 2020-10-12 00:17:54 +07:00
DavHau
8755ac4789 flakes: add dockerImageWith 2020-10-11 18:01:25 +07:00
DavHau
efa86355a3 improve UI: add mkDockerImage, mkOverlay, mkNixpkgs, mkPythonOverrides, 2020-10-11 17:47:12 +07:00
DavHau
edc05c233b throw proper error if 'extra_pkgs' is passed to buildPythonPackage 2020-10-11 16:11:57 +07:00
DavHau
0553396343 add python and pkgs to passthru of mkPython 2020-10-11 16:11:19 +07:00
DavHau
aa0d7cb6b3 disable checks globally via override 2020-10-11 14:41:09 +07:00
DavHau
a24c33fb80 throw proper error if pkgs are passed to mkPython or buildPy... 2020-10-11 11:22:43 +07:00
DavHau
8be56fc14d fix bug introduced by refactoring 2020-10-09 22:37:06 +07:00
James Griffiths
8a77c38585 fix: allow for string setup/install_requires
setuptools allows for install_requires and setup_requires to be either a
string or list of strings. This commit ensures the two formats are
normalised to a list.

https://setuptools.readthedocs.io/en/latest/userguide/keywords.html#id7
2020-10-09 11:53:20 +01:00
DavHau
765d85e550 fix withDot feature 2020-10-08 23:59:09 +07:00
DavHau
1127246052 add: (mkPython {}).dockerImage 2020-10-08 23:42:48 +07:00
DavHau
a2cf285bc5 remove pkgs arg from mkPython and buildPythonPackage 2020-10-08 21:29:14 +07:00
DavHau
856ebd4240 remove last impurities 2020-10-08 01:50:34 +07:00
DavHau
6bf7d93260 relocate pypi-fetcher interface into mach-nix and remove impurities 2020-10-07 23:36:08 +07:00
DavHau
83ca142093 add: withDot package selection feature (flakes) 2020-10-07 12:18:02 +07:00
DavHau
02e36525eb fix flakes 2020-10-04 02:11:50 +07:00
DavHau
469891f8d0 allow to pass derivation as src to buildPythonPackage 2020-10-03 22:08:28 +07:00
DavHau
ea5662c765 add: raise error if python version of any extra_pkg doesn't match 2020-10-03 21:59:47 +07:00
DavHau
4564b6db53 export fetchPypiSdist and fetchPypiWheel 2020-10-03 16:56:11 +07:00
DavHau
19635bf953 improve error message when autodetecting pname fails 2020-10-03 16:53:21 +07:00
DavHau
393cdb9d8f add: export also overlay + nixpkgs in passthru of mkPython 2020-09-29 17:10:46 +07:00
DavHau
0730565673 fix: mkPython.passthru.selectPkgs 2020-09-28 12:23:09 +07:00