Commit graph

109 commits

Author SHA1 Message Date
a-kenji
3faddeaaa9 fix: typos
Fixes some trivial typos, mostly in comments,
except for in `mach_nix/resolver/__init__.py`,
the scope is a context manager, so there shouldn't be arbitrary
sideffects by the rename.
2022-09-08 09:07:24 +02:00
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
Florian Finkernagel
8bae310671 fix: handle non-PEP-440 version strings 2022-07-14 15:19:20 +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
DavHau
c914064c9b Merge remote-tracking branch 'jared-w/master' 2022-02-14 12:59:55 +07: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
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
30f6c6b2d8 update nixpkgs, python, pypi-deps-db 2022-02-03 23:02:45 +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
58f99ca152 update distlib to 0.3.3
fixes #287
fixes #349
2021-11-23 23:13:03 +07: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
Tom Prince
2d2f50cb2a Upgrade resolvelib to 0.4.0. 2021-10-15 15:46:46 -06:00
Tom Prince
b48e38d5dd Remove unused conda dependency. 2021-10-12 13:29:03 -06:00
Tom Prince
9b71888ed4 Allow passing postBuild to mkPython.
Fixes #323.
2021-10-11 21:44:32 -06:00
Tom Prince
7e3683f7d1 Use flake.lock in python package from nix.
Fixes #307.
2021-10-11 13:52:06 -06:00
DavHau
27491cdf25 revert default providers to 'wheel,sdist,nixpkgs' 2021-06-10 00:07:19 +07:00
DavHau
2535798e10 update auto-patchelf.sh 2021-06-09 14:01:47 +07:00
DavHau
c76e162b4d add flake apps for testing 2021-06-09 13:11:17 +07:00
DavHau
4ca6b393b2 add parameter 'condaVersion' + support conda virtual packages 2021-06-08 19:19:56 +07:00
DavHau
7cc60c1292 fix: various bug fixes 2021-06-08 19:18:13 +07:00
DavHau
573bfe16e8 update conda channels 2021-06-08 19:16:14 +07:00
DavHau
c455ed8c56 Merge branch 'master' into conda-beta 2021-05-23 16:22:02 +07:00
DavHau
56c2738780 fix deps-db-and-fetcher.nix 2021-05-23 14:14:33 +07:00
DavHau
a9541433a5 refactor deps-db-and-fetcher 2021-05-23 14:01:06 +07:00
DavHau
46f7940ded update python to 3.8 2021-05-23 13:05:16 +07:00
DavHau
f7fbf74ee0 improve: simplified override interface dealt badly with empty and null values 2021-05-23 12:35:08 +07:00
DavHau
97d744887b simplify flakes cmdline api 2021-05-22 22:02:24 +07:00
DavHau
dc9b7d0c2b conda: rebase on current nixpkgs PR https://github.com/NixOS/nixpkgs/pull/123323 2021-05-22 20:13:42 +07:00
DavHau
31a286bf2a Merge branch 'master' into conda-beta 2021-05-15 16:51:28 +07:00
DavHau
2020f90238 fix: cli crashing on gen command 2021-05-14 14:31:46 +07: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
afcfd0d15b add sdist output to flake 2021-03-12 12:37:07 +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
57959a9ed5 add .expr attribute to mkPython 2021-02-26 12:11:06 +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
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
300b74041d fix: clear provider defaults if environment.yml is loaded 2020-11-23 01:14:30 +07:00