Jean-Paul Calderone
de9907bd71
Get the tor and i2p dependencies into the check environment again
2023-03-27 08:57:51 -04:00
Jean-Paul Calderone
1a6197d07c
Call the right function for getting individual extra deps
2023-03-27 08:35:11 -04:00
Jean-Paul Calderone
c1a70d2872
Merge remote-tracking branch 'origin/master' into 3949.remove-ubuntu-github-actions.2
2023-03-27 07:59:21 -04:00
Jean-Paul Calderone
226da2fb2a
Add missing pyyaml dependency
...
It worked without this because we got the pyyaml dependency transitively but
we should declare it directly since it is a direct dependency.
2023-03-26 11:49:17 -04:00
Jean-Paul Calderone
89fe88bd5b
improve the handling of extras in two ways
...
* Remove the parameter for requesting our own extras. Instead expose our own
extras in `passthru` and let the downstream code pull them in if they want.
This is better because the parameter was non-standard and passing different
values for it alters our derivation whereas the real package behavior is
just that it works if you have the dependencies and doesn't if you
don't (ie, the denotation of the derivation is the same either way).
* Un-nest (join) the Twisted extra dependencies in our dependency list. The
nested list seems to work _sometimes_ but I have some weak evidence that it
doesn't work when using flakes. Either way, the nesting is weird and we might
as well avoid it.
2023-03-23 08:06:02 -04:00
Jean-Paul Calderone
4be12c57b8
Turn off unit test concurrency on PyPy
2023-03-22 09:58:32 -04:00
Jean-Paul Calderone
538dbe5ce9
Find the Python executable when building for PyPy
2023-03-22 09:58:32 -04:00
Jean-Paul Calderone
1a4170003f
adjust the shape of the test-related parameters a bit
2023-03-22 09:54:19 -04:00
Jean-Paul Calderone
934b6c6d6e
support 22.11 as well as current unstable
...
This looks better than what was here before anyway. It would be even
nicer if we could stick with propagatedBuildInputs since that's the
documented parameter for runtime dependencies. However, when using
that, foolscap's `flogtool` is unavailable to the test suite.
2023-03-22 09:52:32 -04:00
Jean-Paul Calderone
1ef65a37ee
It already has a postN suffix
2023-03-22 09:52:32 -04:00
Jean-Paul Calderone
c17341c2d9
Allow the test package to run unit or integration tests
2023-03-22 09:48:28 -04:00
Jean-Paul Calderone
dd8f6d408d
Remove the non-unit test dependencies from the unit test inputs
2023-03-21 08:56:50 -04:00
Jean-Paul Calderone
5cf892b441
Also remove it from the Nix packaging
2023-03-17 15:32:13 -04:00
Jean-Paul Calderone
99559638b9
remove some repetition in the package definition
2023-03-13 19:03:26 -04:00
Jean-Paul Calderone
1b9936bd1b
get lib :/
2023-03-13 17:10:29 -04:00
Jean-Paul Calderone
0d11c6c076
package metadata
2023-03-13 17:06:06 -04:00
Jean-Paul Calderone
17a2c32e1f
Avoid colliding with the "extra" package in nixpkgs :/
2023-03-13 17:02:10 -04:00
Jean-Paul Calderone
f59c6a3acf
Get our dependencies at runtime, too.
2023-03-13 17:01:57 -04:00
Jean-Paul Calderone
93cd2aa354
re-enable nix-based test suite runs
2023-03-13 16:43:22 -04:00
Jean-Paul Calderone
02904a363b
Drop nixpkgs 21.11 - it is missing some stuff we need
...
Not only some nixpkgs facilities but it also includes a rustc that's too old
to build pycddl.
2023-03-13 16:19:07 -04:00
Jean-Paul Calderone
fa2ba64d4d
Also supply the i2p extra dependency, txi2p
2023-03-13 16:02:57 -04:00
Jean-Paul Calderone
568e1b5317
Replace the mach-nix-based package with a nixpkgs-based package
...
The built-in nixpkgs `buildPythonPackage` doesn't do metadata discovery so we
have to duplicate a lot of the package metadata. However, mach-nix is
unmaintained and incompatible with newer versions of nixpkgs.
2023-03-13 15:19:43 -04:00
Jean-Paul Calderone
e482745a0b
drop all of the hand-rolled nix packaging expressions
2022-01-27 12:19:24 -05:00
meejah
c766476236
nix
2022-01-07 13:28:27 -07:00
meejah
95fdaf286e
update nix version
2021-12-05 00:51:13 -07:00
Itamar Turner-Trauring
30511ea850
Add more build inputs.
2021-11-23 11:40:11 -05:00
Itamar Turner-Trauring
a1424e90e1
Another duplicate.
2021-11-16 11:34:44 -05:00
Itamar Turner-Trauring
e5b5b50602
Duplicate package.
2021-11-16 11:28:19 -05:00
Itamar Turner-Trauring
777d630f48
Another dependency.
2021-11-12 12:00:07 -05:00
Itamar Turner-Trauring
e7a5d14c0e
New requirements.
2021-11-12 11:25:10 -05:00
meejah
ffb20d3bbf
Merge pull request #1144 from tahoe-lafs/3754.release-1.16.0-rc1
...
release 1.16.0
2021-10-20 16:04:05 -06:00
meejah
0a072a98c8
Merge pull request #1125 from hacklschorsch/3786.openmetrics
...
3786 Add OpenMetrics (Prometheus) statistics endpoint
2021-09-28 13:21:46 -06:00
Itamar Turner-Trauring
6ef3811112
Prevent conflicting overlapping writes.
2021-09-24 11:54:08 -04:00
fenn-cs
87ea676502
update nix version
...
Signed-off-by: fenn-cs <fenn25.fn@gmail.com>
2021-09-17 11:06:37 +01:00
Florian Sesser
d864cab5b0
OpenMetrics: Add test dep to nix packaging
2021-09-15 11:14:52 +00:00
Itamar Turner-Trauring
d060af641a
Python 3 port is essentially done-get rid of relevant tests and tracking code.
2021-07-30 11:13:57 -04:00
Jean-Paul Calderone
f2ac7814f6
make positive version check result visible in build logs
2021-05-13 08:48:08 -04:00
Jean-Paul Calderone
fb994d3200
Test the Nix package version
2021-05-12 10:05:04 -04:00
Jean-Paul Calderone
a7153baff2
Bump the Nix pkg version to 1.15.1-ish
...
Also make this part of release process.
Also generate a good version number for inside the package for Nix.
2021-05-12 09:52:13 -04:00
Jean-Paul Calderone
cebd0f5547
Switch back to the full test suite
2021-03-16 15:06:51 -04:00
Jean-Paul Calderone
f261b7b297
Apply our own filtering logic
...
Notably, leave .git in so that Tahoe's built-in auto-versioning thing will
work.
2021-03-16 15:00:19 -04:00
Itamar Turner-Trauring
bc7a9a4b7e
Try to fix Nix a different way.
2021-03-09 10:40:49 -05:00
Itamar Turner-Trauring
226b619521
Don't delete test_client.py.
2021-03-09 09:52:48 -05:00
Itamar Turner-Trauring
26297c296d
Merge branch 'master' into 3552.test_system-python-3
2020-12-17 09:42:34 -05:00
Itamar Turner-Trauring
4a587836a5
Port eliotutil and tests to Python 3.
2020-12-15 10:13:46 -05:00
Itamar Turner-Trauring
8ee07d58ee
Fix Nix build.
2020-12-15 09:50:09 -05:00
Itamar Turner-Trauring
d5333ae9f9
Merge remote-tracking branch 'origin/master' into 3485.backported-configparser-for-py-2
2020-10-26 16:53:19 -04:00
Itamar Turner-Trauring
957afa356c
Add new dependency.
2020-10-26 16:09:01 -04:00
Jean-Paul Calderone
682e91382f
*Add* the new dep to the NixOS packaging too
2020-10-23 09:36:26 -04:00
Jean-Paul Calderone
e170d8b881
Remove nettools (iproute2, ifconfig) from the NixOS packaging
2020-10-23 09:33:20 -04:00
