Commit Graph

116 Commits

Author SHA1 Message Date
Jean-Paul Calderone
cb082b2094 Merge remote-tracking branch 'origin/master' into 3998-new-pyopenssl 2023-06-13 10:35:51 -04:00
Jean-Paul Calderone
0b0e5c5c93 Keep using our dontBuildDocs helper function
It does the necessary overrides for stopping doc builds and excluding certain
inputs and outputs.  We can't just set `dontBuildDocs` in the derivation
because that's not a setting recognized by the Nixpkgs Python build system.
2023-06-13 10:34:36 -04:00
Jean-Paul Calderone
8421d406e9 Fix the name metadata as well
It was already computed for the derivation we're going to override.  It won't
be recomputed again as a result of `overrideAttrs` so we recompute it and
include it in the override.
2023-06-13 10:33:54 -04:00
Jean-Paul Calderone
608fbce9f9 match the source tarball hash 2023-06-13 10:18:56 -04:00
Jean-Paul Calderone
e5b6049329 match the package name on pypi, case and all
otherwise urls are misconstructed and stuff fails
2023-06-13 10:16:50 -04:00
Itamar Turner-Trauring
43e4e1b09a Get rid of prefix. 2023-06-05 11:52:24 -04:00
Itamar Turner-Trauring
6e6bae9bf6 Some random other hash who knows 2023-06-05 11:34:52 -04:00
Itamar Turner-Trauring
203fd84a88 Need to import it. 2023-06-05 11:30:11 -04:00
Itamar Turner-Trauring
894cb46304 Try merging the two overrides. 2023-06-05 11:27:23 -04:00
Itamar Turner-Trauring
01bc35f129 Try to update nix pyopenssl. 2023-06-05 10:29:57 -04:00
Jean-Paul Calderone
0e28c8ed4a bump the nix package of txtorcon 2023-05-24 08:54:56 -04:00
Jean-Paul Calderone
f5acaea134 bump the version of klein in the nix-based builds 2023-05-11 09:05:58 -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
35b921b11d Put Python package overrides in one place, and add a lot more of them
These packaging changes fix issues against CPython 3.11 or PyPy.
2023-03-21 08:57:21 -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
41d5538921 Fix maturin build when using PyPy for the pycddl package 2023-03-21 08:56:05 -04:00
Jean-Paul Calderone
900b4a3c98 Package a version of collections-extended compatible with Python 3.11 2023-03-21 08:55:41 -04:00
Jean-Paul Calderone
5cf892b441 Also remove it from the Nix packaging 2023-03-17 15:32:13 -04:00
Jean-Paul Calderone
2a8867f6cf more packaging instructions 2023-03-15 15:47:43 -04:00
Jean-Paul Calderone
aaaec9a69d package update instructions 2023-03-15 15:42:52 -04:00
Jean-Paul Calderone
505032d0ca a note about what this is and what's going on upstream 2023-03-14 20:38:46 -04:00
Jean-Paul Calderone
10414e80ed Remove some unnecessary hierarchy
I thought `default.nix` was handled specially for the purposes of automatic
parameter population but it isn't.  Instead, you just need this `args@{...}`
pattern.
2023-03-14 10:25:02 -04:00
Jean-Paul Calderone
ff50bfe5c4 Accept all the arguments default.nix accepts, too 2023-03-14 10:19:49 -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
1e0e5304d7 actually add the test expression 2023-03-13 17:02:50 -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
96d783534a Bump mach-nix and pypi-deps-db
The newer pypi-deps-db has the pycddl release we want.
The newer mach-nix is required to be compatible with fixes in that pypi-deps-db.
2023-01-23 08:48:29 -05:00
Jean-Paul Calderone
46fbe3d028 bump pypi-deps-db for new pycddl version 2022-10-18 17:32:23 -04:00
Jean-Paul Calderone
cb91012f98 bump the pypi db to a version including upcoming pycddl dependency 2022-04-13 08:25:11 -04:00
Jean-Paul Calderone
2e8c51ac4e bump nixpkgs-21.11 and drop the special zfec handling
the latest zfec release works fine without help
2022-04-13 08:24:53 -04:00
Jean-Paul Calderone
86bcfaa14d Update CircleCI configuration to the new packaging 2022-01-27 13:24:05 -05:00
Jean-Paul Calderone
8a1d4617c2 Add new Nix packaging using mach-nix.buildPythonPackage 2022-01-27 13:00:36 -05: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
d985d10622
Update nix/cbor2.nix
Co-authored-by: Jean-Paul Calderone <exarkun@twistedmatrix.com>
2021-12-01 09:24:03 -05:00
Itamar Turner-Trauring
f2b52f368d Another way. 2021-11-30 13:58:22 -05:00
Itamar Turner-Trauring
136bf95bdf Simpler way. 2021-11-30 13:58:02 -05:00
Itamar Turner-Trauring
2f4d1079aa Needs setuptools_scm 2021-11-30 13:51:36 -05:00
Itamar Turner-Trauring
c65a13e632 Rip out klein, maybe not necessary. 2021-11-30 13:47:28 -05:00
Itamar Turner-Trauring
1fc77504ae List dependencies. 2021-11-30 13:39:42 -05:00
Itamar Turner-Trauring
b01478659e Apparently I generated wrong hashes. 2021-11-30 13:18:18 -05:00
Itamar Turner-Trauring
30511ea850 Add more build inputs. 2021-11-23 11:40:11 -05:00