Commit graph

274 commits

Author SHA1 Message Date
Georges Dubus
746b1f3d7b Fix nix (build|shell) mach-nix#gen
`nix (build|shell) mach-nix#gen` is broken on recent nix versions because
of https://github.com/NixOS/nix/issues/6690.

This commit fixes it by removing `meta` from the list of handled packages.
As a result, nix can access the derivation's meta as expected, and work
as expected.

The side effect is that the `meta` package on pypi cannot be used, but
that's a cost we have to pay.
2022-08-17 11:57:05 +02:00
DavHau
5089c66294
Merge pull request #500 from demin-dmitriy/fix-wheel-python310
fix regex for 2-digit minor python version
2022-07-29 12:48:01 +02:00
Florian Finkernagel
8bae310671 fix: handle non-PEP-440 version strings 2022-07-14 15:19:20 +02:00
Rok Roškar
09d0ff8471
chore: accept newer python versions 2022-07-04 15:42:27 +02:00
DavHau
dd833727d2
Revert "fix wheel selection" 2022-06-22 00:11:35 +02:00
DavHau
a6543ccb70 fix wheel selection
- ignore minor version of python tag
- fixes #464
2022-06-17 10:02:20 +02:00
Demin Dmitriy
4b9e5e087a fix regex for 2-digit minor python version
WheelDependencyProvider didn't handle correctly cases when python's minor version is 2-digit number, e.g. python 3.10.4.
This caused mach-nix to reject some wheel candidates.
2022-06-14 17:45:12 +03:00
DavHau
e0a83fde85
Merge pull request #445 from bjornfor/adapt-to-make-binary-wrapper
Replace --suffix-each with multiple --suffix options
2022-06-01 13:35:25 +02:00
Bjørn Forsman
afce97038d Replace --suffix-each with multiple --suffix options
Since
7f802c7046
using --suffix-each in makeWrapperArgs is no longer supported and breaks
like this:

  $ nix-build ./any-mach-nix-env-with-latest-nixpkgs.nix
  [...]
  <stdin>: In function 'main':
  <stdin>:9:6: error: #error makeCWrapper: Unknown argument --suffix-each
  <stdin>:10:6: error: #error makeCWrapper: Unknown argument PATH
  <stdin>:11:6: error: #error makeCWrapper: Unknown argument :
  <stdin>:12:6: error: #error makeCWrapper: Unknown argument
  builder for '/nix/store/41713mrzrqlq12kgfgcx10wmdvmkfh7k-python3-3.9.12-env.drv' failed with exit code 1

So replace it with multiple --suffix args, which the new
makeBinaryWrapper/makeCWrapper program supports (and is compatible with
the old makeWrapper).

Fixes https://github.com/DavHau/mach-nix/issues/444.
2022-05-09 19:32:44 +02:00
Bjørn Forsman
627ca70ac4 fix-package: pyjq needs nativeBuildInputs 2022-04-07 12:46:26 +02: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
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
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
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
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
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
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
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
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
cecf873f6f fix handling package with dot in name 2021-11-25 13:15:14 +07:00
DavHau
58f99ca152 update distlib to 0.3.3
fixes #287
fixes #349
2021-11-23 23:13:03 +07:00
Jean-Paul Calderone
4d2cc6c6fe try just ignoring direct references 2021-11-12 09:16:07 -05:00
Nasy
ea16287734
Match macosx_11_0_arm64.wheel
e.g. `numpy-1.21.4-cp310-cp310-macosx_11_0_arm64.whl`  https://pypi.org/project/numpy/#files
2021-11-08 14:18:32 -06:00
Florian Finkernagel
2d1efda0b6 correctly parse requirements that end in a stray comma 2021-10-27 11:03:18 +02:00
Tom Prince
19f2abee71 Don't recursively update python dependencies when building package overrides.
Given that we update the dependencies of all the packages we add to the
override, and remove any dependencies of those packages that we don't override,
there is no need to recursivly update the dependencies, since the dependcies we
are adding have already had their dependencies updated.
2021-10-26 19:06:20 -06:00
DavHau
9d4599fa1c
Merge pull request #338 from tp-la/pep440-prereleases
Implement PEP440-compatible prerelease handling.
2021-10-25 15:34:19 +07:00
DavHau
be40cd0739
Merge pull request #335 from tp-la/mkpython-postbuild
Allow passing postBuild to mkPython.
2021-10-25 14:51:34 +07:00
jared-w
6f06aa09cd Don't use busybox on macOS 2021-10-20 13:21:11 -07:00
jared-w
f5c482267c Fix providers.py on macOS 2021-10-20 11:10:56 -07:00
Tom Prince
2d2f50cb2a Upgrade resolvelib to 0.4.0. 2021-10-15 15:46:46 -06:00
Tom Prince
dad6d3948e Track raw provider version, rather than rebuilding. 2021-10-15 15:01:41 -06:00
DavHau
b56a541af1 chore: remove debugging leftovers 2021-10-15 14:09:58 +07:00