yogsototh/mach-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
494 commits 1 branch 0 tags 738 KiB
Commit graph

494 commits

This branch
This branch
All branches
Author SHA1 Message Date
DavHau
f15ea8677d
Merge pull request #495 from GlassGhost/patch-1 
extended readme.md to explain how to provide shared object libraries and find which package provides them
 2022-07-29 12:49:00 +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
DavHau
f2e0ebdf48
Merge pull request #489 from TyberiusPrime/LegacyVersion 
fix: non-PEP-440 version strings handled
 2022-07-29 12:47:00 +02:00
GlassGhost
5a51cd46a0
Update examples.md 
extended description to explain how to provide shared object libraries and find which package provides them
 2022-07-21 09:31:29 -05:00
Florian Finkernagel
8bae310671 fix: handle non-PEP-440 version strings 2022-07-14 15:19:20 +02:00
DavHau
51caf584f2
Merge pull request #474 from TyberiusPrime/install_requires 
fix requirements extraction in setuptools post b6fcbbd
 2022-07-06 08:30:34 +02:00
DavHau
ea5c100907
Merge pull request #483 from rokroskar/000-accepts-newer-python 
chore: accept newer python versions
 2022-07-05 10:35:25 +02:00
Rok Roškar
09d0ff8471
chore: accept newer python versions 2022-07-04 15:42:27 +02:00
Florian Finkernagel
c890a227b3 fix requirements extraction for nixos 22.05 
There were two sources of breakage,
a setuptools change that requires us to pass in
an enviromental variable to get the old behaviour,
and a change of the nixpkgs-python-wrappers from shell
scripts to binary wrappers, which makes another wrapper necessary.
 2022-07-04 10:30:45 +02:00
DavHau
2883380003
Merge pull request #478 from edjroot/patch-1 
README: How to generate a nix expression from a list of requirements
 2022-06-27 22:01:38 +02:00
edjroot
62b1aa445b
Update Readme.md 2022-06-27 11:52:02 -03:00
edjroot
d575bdfae6
README: How to generate a nix expression from a list of requirements 2022-06-27 11:47:57 -03:00
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
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
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