Commit graph

481 commits

Author SHA1 Message Date
DavHau
552d4caa73
Merge pull request #476 from DavHau/revert-471-fix-wheel-selection
Revert "fix wheel selection"
2022-06-22 00:12:05 +02:00
DavHau
dd833727d2
Revert "fix wheel selection" 2022-06-22 00:11:35 +02:00
DavHau
7e84a4e8fe
Merge pull request #471 from DavHau/fix-wheel-selection
fix wheel selection
2022-06-19 22:25:09 +02:00
DavHau
a6543ccb70 fix wheel selection
- ignore minor version of python tag
- fixes #464
2022-06-17 10:02:20 +02:00
lassulus
7e14360bde version 3.5.0 2022-06-01 13:46:43 +02: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
DavHau
26f06e415a
Merge pull request #436 from milahu/patch-1
add section: File resolution (#434)
2022-04-25 23:14:54 +02:00
milahu
8b19e7b14e
add implementation.md 2022-04-25 18:51:48 +02:00
milahu
64e8c51860
fix: remove details 2022-04-25 18:46:24 +02:00
milahu
0901d645c4
add section: File resolution (#434) 2022-04-25 17:22:53 +02:00
DavHau
4dde445784 fix nix eval tests 2022-04-20 16:30:32 +02:00
DavHau
4048790fd8
Merge pull request #412 from moduon/gitpod
feat: support Gitpod
2022-04-20 15:10:11 +02:00
DavHau
fe72f0aeaf
Merge pull request #427 from bjornfor/remove-pipenv-from-extractor
Remove pipenv from dependency extractor derivation
2022-04-20 14:13:45 +02:00
DavHau
7119335f4d
Merge pull request #425 from bjornfor/fix-pyjq
fix-package: pyjq needs nativeBuildInputs
2022-04-20 14:13:11 +02:00
DavHau
6aeedeffed
Merge pull request #402 from PrivateStorageio/nix-version-check
Add a nix version check.
2022-04-20 14:12:13 +02:00
Bjørn Forsman
de2b19d61f Remove pipenv from dependency extractor derivation
This fixes automatic dependency extraction from packages when the user
asks for a python version that differs too much from the default python
in nixpkgs (which pipenv was built with).

Fixes https://github.com/DavHau/mach-nix/issues/426.
2022-04-08 17:40:59 +02:00
Bjørn Forsman
627ca70ac4 fix-package: pyjq needs nativeBuildInputs 2022-04-07 12:46:26 +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
Jairo Llopis
15ca949b82
Change build ignore
Co-authored-by: DavHau <hsngrmpf+github@gmail.com>
2022-03-22 18:10:21 +00: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
Yajo
dc5f764654 feat: support Gitpod
Just click on the readme badge and get into a full development
environment with python, pytest and test debugging integration.
2022-03-22 12:25:38 +00:00
Tom Prince
c5eb17d47d Add a minimum version check. 2022-02-14 12:52:46 -07: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