DavHau
dc9b7d0c2b
conda: rebase on current nixpkgs PR https://github.com/NixOS/nixpkgs/pull/123323
2021-05-22 20:13:42 +07:00
DavHau
8bbb6f63f2
fix: python version not respected for some conda packages
2021-05-22 20:09:08 +07:00
DavHau
dbaf4115ca
Merge branch 'master' into conda-beta
2021-05-16 16:56:37 +07:00
DavHau
31a286bf2a
Merge branch 'master' into conda-beta
2021-05-15 16:51:28 +07:00
DavHau
fdd7bec457
fix: filter out unwanted python dependencies
2021-05-15 12:39:38 +07:00
DavHau
f139a8b68a
fix: python minor version not respected when checking wheels for compatibility
2021-05-14 18:21:48 +07:00
DavHau
51a79318f2
fix: wrong python interpreter in mach-nix cli env
2021-05-14 17:50:40 +07:00
DavHau
1c7af0918b
fix: python package 'overrides' colliding with same named variable in nix expr.
2021-05-14 14:45:36 +07:00
DavHau
2020f90238
fix: cli crashing on gen command
2021-05-14 14:31:46 +07:00
DavHau
6112ea975f
fix VERSION
2021-05-14 14:18:17 +07:00
DavHau
c2812bebdb
Fix + Improve CI ( #275 )
...
- disable tests on macos due to https://github.com/actions/virtual-environments/issues/60
- enable testing of different mach-nix expressions in ./tests
- fix cryptography package < 3.4
2021-05-14 13:54:55 +07:00
DavHau
a4c1ab49b0
update pypiData
2021-05-14 11:38:35 +07:00
DavHau
6b0dc125e7
url-crawler: remove spaces in version numbers
2021-04-30 22:14:17 +07:00
Attila Gulyas
f414001bec
Add nix-shell options in Readme
2021-04-28 12:06:27 +00:00
Martin Schwaighofer
07077afb36
improve error message formatting
2021-04-28 12:06:12 +02:00
Martin Schwaighofer
cf5793c321
fix outdated error message for outdated pypi-deps-db
2021-04-28 12:05:55 +02:00
Bjørn Forsman
1983571a27
Fix typo: nixkgs -> nixpkgs
2021-04-26 11:54:15 +02:00
Tim Sears
abde4e0ce3
Update lib.nix
...
fix typo `trow` -> `throw`
2021-04-20 14:32:55 -07:00
DavHau
41577a83d3
improve: ignore collisions for .gen interface
2021-04-04 21:16:42 +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
ac62255e81
version 3.2.0
2021-03-12 12:47:01 +07:00
DavHau
afcfd0d15b
add sdist output to flake
2021-03-12 12:37:07 +07:00
DavHau
42020f8757
update flake.lock
2021-03-11 16:21:03 +07:00
DavHau
bbfe24052d
fix: wrong python chosen when cross building
2021-03-10 15:51:13 +07:00
DavHau
3ab97d63c1
feature: new argument 'ignoreCollisions'
2021-03-10 15:33:59 +07:00
DavHau
235a0a81d0
pkg-fix: google-auth misses six
2021-02-26 12:11:45 +07:00
DavHau
57959a9ed5
add .expr attribute to mkPython
2021-02-26 12:11:06 +07:00
DavHau
afa94cb61c
change VERSION to 'master'
2021-02-18 15:56:16 +07:00
DavHau
6473903da7
fix: collision when overriding nixpgs
2021-02-17 16:52:24 +07:00
InLaw
f75bd25168
Update nixpkgs.py ( #218 )
2021-01-23 01:19:44 +07:00
InLaw
ae82925edc
Update fixes.nix ( #225 )
...
not mixing python27 and python3x
- could be used with python defined in default.nix (args) - if python would be inherited
2021-01-23 01:12:21 +07:00
DavHau
c4ef8f4a01
add fix for cartopy
2020-12-21 13:55:17 +07:00
DavHau
20e50610f2
also replace nativeBuildInputs on overridden nixpkgs candidates
2020-12-21 13:40:59 +07:00
DavHau
8a719adddf
remove unnecessary env passthru attribute
2020-12-03 23:40:18 +07:00
DavHau
7266eda506
Merge branch 'master' into conda-beta
...
# Conflicts:
# Readme.md
# examples.md
# mach_nix/VERSION
2020-11-29 01:00:50 +07:00
DavHau
8e6913f1a4
CI: load version from MACHNIX_VERSION
2020-11-27 13:54:54 +07:00
DavHau
b64aab5282
version 3.1.1
2020-11-27 13:38:43 +07:00
DavHau
42bc08f8f9
move flake.lock to mach_nix dir and symlink
2020-11-27 12:41:22 +07:00
DavHau
84383f85ae
version 3.1.0
2020-11-27 01:08:36 +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
c3f99612a8
Merge remote-tracking branch 'nat543207/flake-compat'
2020-11-25 13:47:11 +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
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
e365b8582f
fix version bug and requirements parsing
2020-11-21 13:34:51 +07:00
DavHau
26829fc9f4
fix: strip requirements lines before parsing
2020-11-21 10:44:21 +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
f69e56c381
conda: only ignore simple builds during environment.yml parsing
2020-11-20 10:50:12 +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
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
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
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
DavHau
8f7373ee69
WIP: conda
2020-10-26 14:07:15 +07:00
DavHau
ffd51659df
fix: infinite recursion in passthru
2020-10-26 01:12:39 +07:00
DavHau
0925bc4147
WIP: conda
2020-10-26 01:09:37 +07:00
DavHau
230a10d547
fix: infinite recursion in passthru
2020-10-26 01:08:21 +07:00
DavHau
c302ceaafd
WIP: conda
2020-10-25 12:09:08 +07:00
DavHau
ddddcaa774
fix: wrong python version selected by cmdline tool
2020-10-24 16:27:37 +07:00
DavHau
967b21f331
fix: "\u characters in JSON strings are currently not supported"
2020-10-24 16:26:26 +07:00
DavHau
7f54e0678e
version 3.0.1
2020-10-21 14:46:47 +07:00
DavHau
ac1da818d2
remove obsolete orange3 patch (due to new autoPatchelfHook)
2020-10-21 14:18:19 +07:00
DavHau
de9bcb6eba
fix missing providers/versions in printed dep tree
2020-10-20 18:56:37 +07:00
DavHau
b6085ed739
update autoPatchelfHook with some improvements
2020-10-20 18:56:12 +07:00
DavHau
5b77d1c846
fix circular dependency detection + removal
2020-10-20 13:27:40 +07:00
DavHau
0d0d2003f9
update deps-db and nixpkgs
2020-10-19 22:46:38 +07:00
DavHau
d9ff596465
fix debug.py
2020-10-19 22:45:49 +07:00
DavHau
2f9b022d91
Release 3.0.0 ( #159 )
...
* fix non-python packages passed via packagesExtra
* refactor examples and readme for 3.0.0
* add changelog for 3.0.0
* bump version to 3.0.0 and update nixpkgs and pypi-deps-db dependencies
2020-10-14 03:17:27 +07:00
DavHau
abaf0355fe
move python attribute to mach-nix import
2020-10-14 00:29:27 +07:00
InLaw
afcb1e9bf2
Add ci ( #156 )
...
Add CI
2020-10-13 21:39:18 +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
28860c5459
throw error when pkgs / pypi_deps_db_xxx args are used
2020-10-13 16:46:04 +07:00
DavHau
0de3dfc9c2
fix cmdline tool
2020-10-13 15:54:50 +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
4ee7d647fb
fix flakes and add tests for flakes
2020-10-12 10:54:19 +07:00
DavHau
763b15d56d
fix: detect pname properly in mach_nix_file
2020-10-12 10:22:26 +07:00
DavHau
cd24fad1c9
fix-package: rpy2 sdist
2020-10-11 20:29:33 +07:00
DavHau
8755ac4789
flakes: add dockerImageWith
2020-10-11 18:01:25 +07:00
DavHau
aa0d7cb6b3
disable checks globally via override
2020-10-11 14:41:09 +07:00
DavHau
b02f915b7a
fix: wrong buildInputs selected due to name changes
2020-10-11 13:45:45 +07:00
DavHau
52fc618e77
fix: pytorch from nixpkgs not detected as torch ( fixes #148 )
2020-10-10 13:00:13 +07:00
DavHau
2ee1aa8f3f
stop using nix_names as keys; improve get_passthru; add test
2020-10-09 22:36:11 +07:00
DavHau
765d85e550
fix withDot feature
2020-10-08 23:59:09 +07:00
DavHau
67df1d2a15
evolve: inherit more py pkgs when overriding nixpkgs, but replace redundant
2020-10-08 21:25:52 +07:00
DavHau
1c49828e56
update help text for --nixpkgs
2020-10-08 14:43:56 +07:00
DavHau
6d7bc3eb35
improve: updating deps workflow + cmdline option
2020-10-08 14:10:31 +07:00
TLP49i7_ae
c2d5f95bb8
add parameter to choose nixpkgs version (show it in --version) and add examples
2020-10-08 11:58:34 +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
7ed1116bd1
update nixpkgs and fix nix tests
2020-10-07 23:23:52 +07:00
DavHau
c89fbb88b4
fix: select correct wheel + add tests for it
2020-10-07 22:56:33 +07:00
DavHau
252b8b8a95
update deps-db and add twine to dev shell
2020-10-07 12:19:02 +07:00
DavHau
83ca142093
add: withDot package selection feature (flakes)
2020-10-07 12:18:02 +07:00
DavHau
ced54d27a1
package-fix: remove patches for httpx
2020-10-07 12:17:00 +07:00
DavHau
b0d0081d3d
fix: unwanted python buildInput inheritance when overriding nixpkgs
2020-10-06 21:30:07 +07:00
DavHau
8de0d2ceda
fix: select wrong python version for wheel
2020-10-06 13:34:12 +07:00
DavHau
2ee3786b06
remove useless trace in mariadb fix
2020-10-03 17:36:21 +07:00
DavHau
4564b6db53
export fetchPypiSdist and fetchPypiWheel
2020-10-03 16:56:11 +07:00
DavHau
59ae625c23
add fix for mariadb (but: package not yet available)
2020-10-03 16:54:28 +07:00
DavHau
91a263d5f4
fix-package: pyqt5 from nixpkgs and wheel
2020-09-22 17:49:28 +07:00
DavHau
7e81743f97
fix: nixpkgs packages with identical versions swallowed
2020-09-22 17:47:29 +07:00
DavHau
ac05859dcb
version 2.4.1
2020-09-21 13:29:56 +07:00
DavHau
b7e05a1739
fix: null value in get_passthru. fixes #131
2020-09-21 12:30:55 +07:00
DavHau
c06f58f3b8
package-fix: allow sdist provider for pip
2020-09-21 12:30:19 +07:00
DavHau
1d7ca9fb7e
fix-package: remove reproducible.patch from pip versions older than 20.0
2020-09-21 12:16:03 +07:00
DavHau
4070c03e71
fix: wrong provider detected in fixes for sdist packages
2020-09-21 12:01:00 +07:00
DavHau
b37d9bb196
version 2.4.0
2020-09-20 17:41:35 +07:00
DavHau
460501c1ae
pump pypi deps and nixpkgs
2020-09-20 15:56:18 +07:00
DavHau
b3a42dfa91
fix: provider check in conditions for fixes
2020-09-20 15:30:20 +07:00
DavHau
fb0aa8f926
fix: wheels with multiple python versions in filename (pyqt5)
2020-09-16 11:16:03 +07:00
DavHau
7efb5de273
add fix for orange 3
2020-09-16 02:11:48 +07:00
DavHau
d401de7b87
stop unifying pkg-names -> fixes passthru inf. recursions
2020-09-15 13:48:35 +07:00
DavHau
bc2157e530
fix get_passthru; fix problem with dot in names
2020-09-13 21:52:52 +07:00
DavHau
7098c4b6e6
fix passthru already defined
2020-09-13 21:42:07 +07:00
DavHau
57ac0f997c
Merge branch 'fixes2' into dev
...
# Conflicts:
# mach_nix/generators/overides_generator.py
2020-09-13 21:38:29 +07:00
DavHau
976c4461c8
feature: fixes.nix
2020-09-13 21:34:54 +07:00
DavHau
02d2779810
inherit passthru from nixpkgs
2020-09-12 20:19:41 +07:00
DavHau
de1a164858
version 2.3.0
2020-08-26 13:19:25 +07:00
DavHau
76238f2825
automatically detect name and version from source
2020-08-25 10:11:08 +07:00
DavHau
83385f91ee
fix bug: buildInputs with dot in name
2020-08-24 14:33:27 +07:00
DavHau
e7c549084e
fix version filtering bug introduced by 944d50cd09
2020-08-23 20:11:49 +07:00
DavHau
edd42746a4
update deps db and nixpkgs
2020-08-23 19:41:50 +07:00
DavHau
944d50cd09
fix: don't user normalized version to reference package
...
(fixed #93 , fixes #92 , fixes #82 )
2020-08-23 19:39:47 +07:00
DavHau
662407c0f3
remove rec from overrides ( fixes #97 )
2020-08-20 14:36:20 +07:00
DavHau
6a8718b7e1
fix bug introduced by quoting top level attr names
2020-08-20 14:32:57 +07:00
DavHau
0963d72ba8
fix top level deps with dot in name ( fixes #83 )
2020-08-18 13:07:04 +07:00
DavHau
f0b3b3c8e5
version 2.2.2 ( #88 )
...
# 2.2.2 (17 Aug 2020)
### Fixes
- Packages with dot in name led to invalid nix expression
- Problem generating error message for resolution impossible errors
- `buildPythonPackage` of mach-nix failed if arguments like `pkgs` were passed.
- When overriding packages, mach-nix now falls back to using `overrideAttrs` if `overridePythonAttrs` is not available.
### Package Fixes:
- pip: installation failed. Fixed by forcing `nixpkgs` provider
- gdal: building from sdist doesn't work. Fixed by forcing `nixpkgs` provider
### Development
- Merged project `pypi-crawlers` into mach-nix (was separated project before)
2020-08-17 18:16:56 +07:00
DavHau
dd71ac96d5
fix ResolutionImpossible error msg; fix crash on packages with dot in name
2020-08-12 00:15:12 +07:00
DavHau
e160c5c93a
force pip from nixpkgs; remove importmagic3 default providers
...
- fixes #61
2020-08-12 00:15:12 +07:00
