Bjørn Forsman
afce97038d
Replace --suffix-each with multiple --suffix options
...
Since
7f802c7046https://github.com/DavHau/mach-nix/issues/444 .
2022-05-09 19:32:44 +02:00
DavHau
86c3111786
Merge pull request #421 from bjornfor/fix-example-ref
...
examples: fix a builtins.fetchGit ref
2022-03-28 10:00:28 +07:00
Bjørn Forsman
8d05f09275
examples: fix a builtins.fetchGit ref
2022-03-27 19:22:25 +02:00
DavHau
7b0e7f6f58
Merge pull request #413 from bjornfor/fix-typo
...
Fix typo: bene -> been
2022-03-22 22:33:13 +07:00
Bjørn Forsman
d957f992b1
Fix typo: bene -> been
2022-03-22 15:10:40 +01:00
DavHau
c914064c9b
Merge remote-tracking branch 'jared-w/master'
2022-02-14 12:59:55 +07:00
DavHau
309b7d5f1a
disable some eval tests for conda
...
Most of these got stuck because of a resolution too deep error.
2022-02-14 12:42:38 +07:00
DavHau
437e368c27
Merge remote-tracking branch 'tp-la/resolvelib-0.8.1' into merge
2022-02-14 12:00:21 +07:00
DavHau
80596c5d7a
wheel+conda provider: return [] for build deps
2022-02-14 12:00:19 +07:00
jared-w
8b58970aaa
protected check of build_inputs and prop_build_inputs
2022-02-12 09:38:45 -08:00
jared-w
59275df11a
add darwin aarm64 check to lib overrides
2022-02-12 09:38:45 -08:00
DavHau
c7b793ffb7
Merge pull request #397 from tp-la/improve-ci
...
Improve CI.
2022-02-10 13:23:12 +07:00
Tom Prince
d7f6081cd6
Fix unit test execution in CI.
...
This switches to using `python -m pytest`, which causes the
current directory to be added to the python path.
2022-02-09 17:59:08 -07:00
Tom Prince
aba66a51b5
Make sure conda tests run with conda.
2022-02-09 17:57:50 -07:00
Tom Prince
014f915869
Split CI into multiple tasks.
2022-02-09 17:59:02 -07:00
Tom Prince
da584442d3
Stop using a nix prerelease in CI.
...
Additionally, stop installing an extra copy of nix.
2022-02-09 17:54:07 -07:00
Tom Prince
8c0a86b93b
Upgrade resolvelib to 0.8.1.
2022-02-09 13:09:18 -07:00
Tom Prince
3ecc3bfbf1
Upgrade resolvelib to 0.6.0.
2022-02-09 12:55:25 -07:00
DavHau
76b24c7a52
fix mistake in flake.nix example
2022-02-04 15:55:44 +07:00
DavHau
94907133d5
fix example flake.nix
...
closes #388
2022-02-04 15:34:50 +07:00
DavHau
383c5ebc0b
fix release date in changelog
2022-02-04 12:57:47 +07:00
DavHau
fe5255e6fd
version 3.4.0
2022-02-04 12:43:29 +07:00
DavHau
f0f48efdd6
package-fix: pyqt5 wheel + nixpkgs
2022-02-04 12:28:46 +07:00
DavHau
b707c72fff
Merge pull request #394 from DavHau/fix-dependency-removal
...
Fix unwanted dependency removal; update nixpkgs + deps-db
2022-02-04 10:40:47 +07:00
DavHau
bb0b041c38
fix typo in comment
2022-02-04 10:25:07 +07:00
DavHau
8ea48a742b
only execute pre-commit hook on master
2022-02-04 10:01:52 +07:00
DavHau
d6f111c30e
Merge pull request #393 from DavHau/macos-arm64
...
fix: wheel selection for macos arm64
2022-02-04 09:30:01 +07:00
DavHau
2659c50bce
fix: wheel selection for macos arm64
2022-02-04 09:24:57 +07:00
DavHau
0078acd709
update conda-channels
2022-02-04 01:16:25 +07:00
DavHau
6a44e84351
fix bug in lib.nix
2022-02-04 01:16:10 +07:00
DavHau
c7da997337
fix bug in deptree.py
2022-02-04 01:15:59 +07:00
DavHau
30f6c6b2d8
update nixpkgs, python, pypi-deps-db
2022-02-03 23:02:45 +07:00
DavHau
c25116245d
improve unwanted dependency removal
...
- retrieve dependency information for nixpkgs packages only from sdist and not from wheel provider
- skip dependency removal if package dependencies are unknown
2022-02-03 22:11:44 +07:00
DavHau
655f0360ce
fix: wheel selection for macos arm64
2022-02-03 13:33:05 +07:00
DavHau
b492af0b10
Merge pull request #390 from joshbode/joshbode/python3-fix
...
use pkgs.python3 instead of pkgs.python(2)
2022-02-03 09:53:27 +07:00
Josh Bode
fbb6c3b932
use pkgs.python3 instead of pkgs.python(2)
2022-02-03 08:04:22 +11:00
DavHau
2d1360e4e2
Merge pull request #386 from tp-la/extra-pkg-dependencies
...
Update dependencies of python packages specified in packagesExtra in mkPython.
2022-02-02 15:13:18 +07:00
DavHau
7f1372dae7
update pypi-deps-db & fix test
2022-01-29 12:31:13 +07:00
DavHau
5cb044477e
Merge pull request #387 from DavHau/macos-arm64
...
Macos arm64
2022-01-28 13:34:23 +07:00
DavHau
94a36bee39
Merge pull request #363 from tp-la/extraneous-dep
...
Remove the dependency on python pkgconfig package in the dependency extractor.
2022-01-28 13:08:27 +07:00
DavHau
2e63cb554a
fix macos arm64 wheel selection
...
closes #350
2022-01-28 12:39:42 +07:00
DavHau
7c05e2bc5b
Merge branch 'pr-350' into macos-arm64
2022-01-28 12:32:43 +07:00
DavHau
cfe9e6e642
Merge pull request #359 from DavHau/fix-package-with-dot
...
fix handling package with dot in name
2022-01-28 12:12:05 +07:00
Tom Prince
8af033353d
Refactor conda provider to iterate over packages once.
2022-01-27 16:26:43 -07:00
Tom Prince
f101dc4c27
Update dependencies of python packages specified in packagesExtra in mkPython.
...
Otherwise, it is likely that there will be collisions building the python environment,
as the dependencies of packages in packagesExtra won't match with the dependencies
calculated by mach-nix.
As a side-effect, this also causes the dependencies of mach-nix built packages included
by the `nixpkgs` provider to be included in dependency resolution.
2022-01-27 15:42:42 -07:00
Tom Prince
ac3e70ea68
Pass name ane version explicitly, rather than as a string, for nixpkgs python package versions.
...
This changes the internal format used to pass version information for nix to
python to not require parsing strings. This new format also makes it easier
to pass additional information (such as requirements, when available).
2022-01-27 15:41:38 -07:00
DavHau
bdc97ba6b2
Merge pull request #373 from vincentbernat/doc/flake
...
Add an example using a Flake
2022-01-04 21:31:05 +01:00
Vincent Bernat
83225b5eef
Add an example using a Flake
2022-01-02 16:21:57 +01:00
Tom Prince
7e2dddd8e7
Remove the dependency on python pkgconfig package in the dependency extractor.
...
This causes dependency extraction to fail on python2, with nixos-21.11.
2021-12-02 12:53:56 -07:00
DavHau
cecf873f6f
fix handling package with dot in name
2021-11-25 13:15:14 +07:00
