diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2021-08-17 18:52:37 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2021-08-17 18:52:37 +0200 |
| commit | e286e1cfa0c09fe1e5ce355c36a23b823a33adef (patch) | |
| tree | a7125b17df22d0080466da4714ec4a04767efd1d /pkgs/development/python-modules/rangehttpserver | |
| parent | 8517ea002bfc324759e3833f389ab9c1635e8531 (diff) | |
| parent | 83e0efe6777e10ad778424c529645432fad7e5b8 (diff) | |
Merge branch 'staging-next' into staging
- boost 167 removed on staging-next (7915d1e03f93f3072ab397448830d028202e5d3d) × boost attributes are inherited on staging (d20aa4955d4c31d8393753ddf088e1ee82c5d12e)
- linux kernels were moved to linux-kernels.nix on staging-next (c62f911507977ac67fd5e8547af2d1071c5e0891) × hardened kernels are versioned on staging (a5341beb789c66ed24a11396dda28f2a1303768e) + removed linux_5_12 (e55554491df6e7b789d7f3d6a3b354df3575e1c6)
- conflict in node-packages – I regenerated it using node2nix from nixos-unstable (does not build on staging)
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions