Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

staging-next-24.05 iteration 6 - 2024-11-01 #352800

Merged
merged 164 commits into from
Nov 7, 2024
Merged

Conversation

mweinelt and others added 30 commits September 8, 2024 04:26
These are backported from new version 4.7.0

https://libtiff.gitlab.io/libtiff/releases/v4.7.0.html

Note that libtiff_t v4.6.0t already contains these patches.
* nodejs_18: pin to Python 3.11, fix tests with OpenSSL 3.0.14

(cherry picked from commit 7c1177c)

* nodejs: use upstream patch instead of custom one

(cherry picked from commit f75d503)

* nodejs_22: 22.4.1 -> 22.5.1

(cherry picked from commit 070791f)

* nodejs: use .finalPackage for ease of overriding

Previously, the nodejs `passthru.pkgs` attribute refers to the package
fixed point derived in the current context, without considering
potential overrides to the main nodejs package.

This is fixed here with the `.finalPackage` attribute, which refers to
the final package fixed point, after potential overrides.

For example, previously, after overriding nodejs with `nodejs.override`,
`nodejs.pkgs` would still refer to the original package, instead of the
overridden one. After this fix, `nodejs.pkgs` would be correctly based
on the overridden `nodejs` package.

(cherry picked from commit ee9a623)

* nodejs: fix tests and disable parallel checking

(cherry picked from commit d7f46fb)

* nodejs: disable failing tests on x86_64-darwin

(cherry picked from commit 31d2381)

* nodejs: skip tests failing in sandbox in all platforms

ce685a8 added list of tests failing on sandbox, but for some reason
only for Darwin. We should skip those tests on all platforms otherwise
OfBorg builds are failing.

(cherry picked from commit f5846d2)

* nodejs_20: 20.15.1 -> 20.16.0

(cherry picked from commit 35b556d)

* nodejs: 22.5.1 -> 22.6.0 (#333210)

(cherry picked from commit 4c38d8a)

* nodejs_22: 22.6.0 -> 22.7.0 (#336556)

(cherry picked from commit c455cc3)

* nodejs_20: 20.16.0 -> 20.17.0 (#336388)

(cherry picked from commit 45db1ff)

* nodejs_22: 22.7.0 -> 22.8.0

(cherry picked from commit 235ae9c)

---------

Co-authored-by: K900 <[email protected]>
Co-authored-by: Bryan Lai <[email protected]>
Co-authored-by: Ivan Trubach <[email protected]>
(cherry picked from commit 18459ab)
Without the change tests fail on darwin as
https://hydra.nixos.org/build/272249259/nixlog/164/tail:

    curl: (77) error setting certificate file: /no-cert-file.crt

Possibly because `stdenv` has `curl` there. Upstream suggests disabling
networking access with `CURL=:`. Let's use that.

(cherry picked from commit eff4e92)
@vcunat
Copy link
Member Author

vcunat commented Nov 1, 2024

This has been accumulating for longer than I would've liked. I hope we'll improve the infra soon, so that these iterations can be done faster.

github-actions bot and others added 5 commits November 2, 2024 00:16
(cherry picked from commit 345bbd8)

https://github.com/alexmojaki/executing/releases/tag/v2.1.0
This fixes tests with the current 3.11 and 3.12 python.
Just adding the patch didn't work for me, so I pick the whole update.
This was discussed upstream here:
https://postgr.es/m/0a997455-5aba-4cf2-a354-d26d8bcbfae6%40technowledgy.de

This will be in the next minor releases, until then apply the patch.

(cherry picked from commit 52bb840)
(from PR #342026)
@nix-owners nix-owners bot requested a review from thoughtpolice November 4, 2024 08:50
@vcunat vcunat merged commit ae987b5 into release-24.05 Nov 7, 2024
14 checks passed
@vcunat
Copy link
Member Author

vcunat commented Nov 7, 2024

Let's consider this one Linux-only.

That is, we merge even though we have few darwin binaries and temporarily disable the nixpkgs-24.05-darwin jobset. And we'll catch up on the next 24.05 iteration which surely must come anyway, given that we promise maintenance (at least) until the end of 2024.

I think this wouldn't be the first time to do such a thing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 6.topic: golang 6.topic: kernel The Linux kernel 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs 6.topic: printing 6.topic: python 6.topic: vim 8.has: clean-up 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 501+ 10.rebuild-darwin: 5001+ 10.rebuild-darwin-stdenv This PR causes stdenv to rebuild 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+ 10.rebuild-linux-stdenv This PR causes stdenv to rebuild
Projects
None yet
Development

Successfully merging this pull request may close these issues.