Commit graph

1127 commits

Author SHA1 Message Date
adisbladis
ff4c1b9068 Fix file deps test 2022-01-18 21:06:29 +12:00
adisbladis
cacab99101 overrides: Create addPbr abstraction 2022-01-18 21:06:29 +12:00
adisbladis
fbc86b40d4 overrides: Create addPoetry abstraction 2022-01-18 21:06:29 +12:00
adisbladis
71f665c5bf overrides: Create addFlit abstraction 2022-01-18 15:47:50 +12:00
adisbladis
8be11cbe8f Remove dontPreferSetupPy & don't remove pyproject.toml ever
It seems like this bandaid to avoid some build-system related overrides causes more problems than it fixes.
Let's just deal with reality up-front and hope that https://github.com/python-poetry/poetry/issues/2789 will be fixed at some point.
2022-01-18 15:18:57 +12:00
adisbladis
23be9b3cb0
Merge pull request #466 from cpcloud/remove-bootstrap-poetry
build: remove bootstrap dependency on poetry
2022-01-18 15:18:22 +12:00
adisbladis
6f31c4ed1d
Merge pull request #512 from nix-community/fetchgit-nix24
fetchGit: work-around bug in Nix 2.4
2022-01-18 10:04:56 +12:00
László Vaskó
8e1eef3751 fetchGit: use allRefs only when it is needed
If `branch` or `tag` is given in sourceSpec, then `fetchGit` would
work as before, the only problematic setup is `rev` when used with Nix 2.4+
2022-01-18 09:53:24 +12:00
László Vaskó
5c06704d45 fetchGit: work-around bug in Nix 2.4
Another approach to make `poetry2nix` work with dependencies specified
by arbitrary `rev=<hash>` values on newer Nix revisions.

Relates-to: https://github.com/nix-community/poetry2nix/pull/358
Relates-to: https://github.com/NixOS/nix/issues/5128
2022-01-18 09:53:24 +12:00
adisbladis
a47cc109f8
Merge pull request #511 from nix-community/no-recurse-checkinputs
Add overlay that disables checks for packages inherited from nixpkgs
2022-01-17 23:41:17 +12:00
adisbladis
504dc068bb Add overlay that disables checks for packages inherited from nixpkgs
This is a more principled fix to #510 that will hopefully prevent this entire class of errors.
2022-01-17 22:24:06 +12:00
adisbladis
83a135e781
Merge pull request #510 from nix-community/pyparsing-no-recurse
overrides.pyparsing: Prevent infinite recursion by disabling tests
2022-01-17 22:02:24 +12:00
adisbladis
01ae862d09 overrides.pyparsing: Prevent infinite recursion by disabling tests 2022-01-17 21:45:08 +12:00
adisbladis
7b5c8e3b83
Merge pull request #508 from lunik1/pymssql
overrides.pymssql: add override
2022-01-15 14:55:33 +12:00
adisbladis
73de0ca6a3
Merge pull request #507 from lunik1/pyrfr-override
overrides.pyrfr: add override
2022-01-15 14:54:50 +12:00
adisbladis
e950659441
Merge pull request #509 from vale981/patch-2
fix typo in overrides: enableTk -> enableGtk3
2022-01-15 14:54:32 +12:00
adisbladis
c2250a8c02
Merge pull request #506 from lunik1/flatbuffers-override
overrides.flatbuffers: add override
2022-01-15 14:54:06 +12:00
390173bce2
fix typo in overrides: enableTk -> enableGtk3 2022-01-14 19:26:31 +01:00
lunik1
601609e83b
overrides.pymssql: add override 2022-01-14 16:57:34 +00:00
lunik1
bdecd74f6e
overrides.pyrfr: add override 2022-01-14 12:21:35 +00:00
lunik1
c5d345cb06
overrides.flatbuffers: add override
Co-authored-by: Bryan Bennett <Bryan.Bennett@protonmail.com>
2022-01-14 12:09:29 +00:00
adisbladis
cf1547ba2b
Merge pull request #505 from crabhi/patch-1
Cymem needs Cython
2022-01-13 02:21:28 +12:00
Filip Sedlák
31fde2890a
Cymem needs Cython
The https://pypi.org/project/cymem/ package fails to build without Cython.
2022-01-12 14:00:18 +01:00
adisbladis
212535c3c3
Merge pull request #503 from Yajo/patch-1
Remove rec from template
2022-01-12 21:58:38 +12:00
Jairo Llopis
a71ffbe7c5
Remove rec from template
It seems this is an anti-pattern, according to https://nix.dev/anti-patterns/language#rec-expression.

So, I suggest to remove it from there. Better not ship anti-patterns on templates, isn't it?
2022-01-12 08:42:40 +01:00
adisbladis
f07f509004 Bump version to 1.26.0
I think revived Python2 compat warrants a release!
2022-01-12 20:16:23 +13:00
adisbladis
d49a269465
Merge pull request #502 from nix-community/py2-compat
Various fixes and checks for python2 compatibility
2022-01-12 19:10:29 +12:00
adisbladis
f95121b884 Add CI job for black formatting 2022-01-12 18:48:06 +13:00
adisbladis
7a7dcbe2e1 Add CI job for Python2 compat checks 2022-01-12 18:48:06 +13:00
adisbladis
f46e65a006 Fix python2 compat issues in fetch_from_legacy.py 2022-01-12 18:48:06 +13:00
adisbladis
b8d3545eba Add tooling to detect Python2 syntax errors 2022-01-12 18:48:06 +13:00
adisbladis
8078110a7f Reformat all Python code using Black 2022-01-12 18:48:06 +13:00
adisbladis
b4d2477b1f Add a basic python environment for tooling to nix-shell
I want to start formatting all Python code in the repository with black, let's dogfood this and use poetry2nix to provide it.
2022-01-12 18:48:06 +13:00
adisbladis
6d4d6251f3
Merge pull request #501 from nix-community/ensure_ascii_py2
fix: Only set ensure_ascii to False for Python >= 3
2022-01-12 17:47:15 +12:00
adisbladis
d26cd8d7c5 fix: Only set ensure_ascii to False for Python >= 3 2022-01-12 18:07:34 +13:00
adisbladis
dc8b983f3f Bump version to 1.25.0 2022-01-12 17:51:53 +13:00
adisbladis
35f45fc515
Merge pull request #500 from nix-community/nixops-1_7-overrides
overrides: Add overrides to build NixOps 1.7
2022-01-12 16:39:59 +12:00
adisbladis
115a77b97e overrides.wcwidth: Add override 2022-01-12 17:34:16 +13:00
adisbladis
ddea306081 overrides.pysqlite: Add override 2022-01-12 17:34:16 +13:00
adisbladis
08c77c5078 overrides.prettytable: Add override 2022-01-12 17:34:16 +13:00
adisbladis
9cb97ec589 overrides.backports.functools-lru-cache: Add override 2022-01-12 17:34:16 +13:00
adisbladis
48e98cefbc
Merge pull request #499 from Sohalt/scikit-image
overrides: add scikit-image
2022-01-12 08:56:47 +12:00
sohalt
59a1fef437 overrides: add scikit-image 2022-01-11 15:02:50 +01:00
adisbladis
419339b35d
Merge pull request #497 from nlewo/fix-legacy
The package URL is relative to the index URL
2022-01-11 23:01:29 +12:00
adisbladis
79a3fcb22f
Merge pull request #498 from Sohalt/tables-hdf5
overrides: tables: fix HDF5_DIR
2022-01-11 21:58:57 +12:00
sohalt
91301410ce overrides: tables: fix HDF5_DIR 2022-01-11 10:41:49 +01:00
Antoine Eiche
48c228ac63 The package URL is relative to the index URL
This fixes a regression introduced by f7ab15e390.

In case of a devpi repository,
- the index url looks like

    https://devpi.company/company/dev/+simple/python-package

- the package relative URL looks like

    /../../+f/d00/a3edd114f3e81/package.tar.gz#sha256=d00a3edd114f3e813e0e22e07513361b00d925fb67057a3452a897c8623f73f6

- the URL to download the package is

    https://devpi.company/company/dev/+f/d00/a3edd114f3e81/package.tar.gz#sha256=d00a3edd114f3e813e0e22e07513361b00d925fb67057a3452a897c8623f73f6

With the commit f7ab15e390, the URL to
download the package was

    https://devpi.company/+f/d00/a3edd114f3e81/package.tar.gz#sha256=d00a3edd114f3e813e0e22e07513361b00d925fb67057a3452a897c8623f73f6

which doesn't exist.
2022-01-11 09:37:05 +01:00
adisbladis
bc70a5c975
Merge pull request #496 from nix-community/fetched-projectdir-test
tests: Add test for IFD projectDir
2022-01-11 10:05:57 +12:00
adisbladis
6b063a31bc overrides: Add fastapi override 2022-01-11 10:16:02 +13:00
adisbladis
6e5bdfb5b1 tests: Add test for IFD projectDir 2022-01-11 10:16:02 +13:00