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 2022-03-23 #165406

Merged
merged 928 commits into from
Apr 5, 2022
Merged

Staging next 2022-03-23 #165406

merged 928 commits into from
Apr 5, 2022

Conversation

mweinelt and others added 30 commits March 14, 2022 00:29
Entire test suite can take 100+ vCPU hours
Obsoleted by pytest-dev/pytest#9134, which was
released as part of pytest 7.0.0.

It has pytest<7 pinned, and we only have the single pytest version, so
it can be removed.
@jtojnar
Copy link
Member

jtojnar commented Apr 4, 2022

python2.2-pycairo, dependency of gimp, fails to build

#167216

FRidh and others added 8 commits April 4, 2022 20:39
This reverts commit c1ef87e.
I didn't realize that it would rebuild all linux stdenvs;
I certainly don't want to incur such a rebuild at this point.
This time without rebuilding stdenvs.
Dropped in 0c852e1 (syntax error).  If I looked at history right,
it has never been used (but indirectly through cryptsetup).
I expect it's a remnant of different attempts at breaking depenency
cycle which we now solve through systemdMinimal.
…overrides

[staging-next] systemdStage1: Fix building with 250
@NANASHI0X74
Copy link
Contributor

Hey guys, the manual doesn't really tell me about what needs to happen or at what times staging-next gets merged into main. When can we expect this to be merged? since nixpkgs-unstable has been blocked for nine days at this point

@mweinelt
Copy link
Member

mweinelt commented Apr 5, 2022

There are still regressions we need to take care of before this can get merged. See for example #165406 (comment).

@NANASHI0X74
Copy link
Contributor

There are still regressions we need to take care of before this can get merged. See for example #165406 (comment).

thanks 😅
I don't really know how to read the hydra jobs... Can you see the remaining issues in there?
Guess I should read the hydra documentation, right? 🙃😄

github-actions bot and others added 2 commits April 5, 2022 12:05
This reverts commit 9adc208.
Clash with update; the patch is already contained and won't apply.
@Artturin
Copy link
Member

Artturin commented Apr 5, 2022

machine # error: unable to download 'https://salsa.debian.org/debian/keyutils/raw/4cecffcb8e2a2aa4ef41777ed40e4e4bcfb2e5bf/debian/patches/Make-build-reproducible.patch': Couldn't resolve host name (6)
machine # error: builder for '/nix/store/f450ks5xaq790h43nc5r78x69cr4721q-Make-build-reproducible.patch.drv' failed with exit code 1

i'll make a pr that inlines this in postPatch

This fixes build in qt514 case.

The usual way here is to provide patches for each qt5 version
separately.  No other module adds them in this generic way.
The problem is when you combine the approaches; qtModule will only
take the list from the module and ignore the version-specific list.
@mweinelt
Copy link
Member

mweinelt commented Apr 5, 2022

machine # error: unable to download 'https://salsa.debian.org/debian/keyutils/raw/4cecffcb8e2a2aa4ef41777ed40e4e4bcfb2e5bf/debian/patches/Make-build-reproducible.patch': Couldn't resolve host name (6)
machine # error: builder for '/nix/store/f450ks5xaq790h43nc5r78x69cr4721q-Make-build-reproducible.patch.drv' failed with exit code 1

i'll make a pr that inlines this in postPatch

The real question is why this started failing after it has been there for three years, so you'll be creating a workaround, not a fix.

@Artturin
Copy link
Member

Artturin commented Apr 5, 2022

#167346

@vcunat
Copy link
Member Author

vcunat commented Apr 5, 2022

@Zimmi48
Copy link
Member

Zimmi48 commented Apr 5, 2022

There are patches available for glibc-2.34 for all OCaml versions. See the patch files added in most directories of https://github.com/ocaml/opam-repository/tree/master/packages/ocaml-base-compiler in ocaml/opam-repository@0503533.

@vbgl
Copy link
Contributor

vbgl commented Apr 5, 2022

Thanks Théo for digging this up. Are you going to do a PR? If not, please let me know and I’ll do it ASAP.

@Zimmi48
Copy link
Member

Zimmi48 commented Apr 5, 2022

@vbgl No sorry, I am very short on time this week.

See errors in these three jobs:
https://hydra.nixos.org/eval/1753111#tabs-still-fail
It's a bit unpleasant that a single run of each test takes
almost an hour for me (half an hour on Hydra in some cases).
@vcunat vcunat merged commit b4729ba into master Apr 5, 2022
@vcunat
Copy link
Member Author

vcunat commented Apr 5, 2022

Let's defer fixing the rest to master.

@vcunat
Copy link
Member Author

vcunat commented Apr 6, 2022

Here you can see (transitive) build regressions for the three main platforms, total about two thousand: https://hydra.nixos.org/eval/1753470#tabs-now-fail
(for @NANASHI0X74 or anyone)

@winterqt
Copy link
Member

Seemingly, a change in this iteration is causing #167854, and I have absolutely no clue what change could be the culprit. Not sure if the correct route is to disable/patch the test for it to complete or not, I guess it depends on what change is causing this.

@sternenseemann
Copy link
Member

This iteration seems to break buildRustPackage derivations that have an empty list of dependencies, e.g. elfcat. This is because the behavior of cargo vendor changed.

Before (first line is stderr of course):

To use vendored sources, add this to your .cargo/config.toml for this project:

[source.vendored-sources]
directory = "elfcat-1.0-vendor.tar.gz"

After (what you see is stderr, stdout is empty):

There is no dependency to vendor in this project.

This breaks the cargo-vendor-normalise script.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Inkscape fails to build on x86_64-darwin