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

postgresql: fix regress tests after tzdata update #342026

Merged
merged 1 commit into from
Sep 15, 2024

Conversation

wolfgangwalther
Copy link
Contributor

Description of changes

postgresql is currently broken on staging, after the tzdata update (#339913) due to failing regression tests.

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. Applying the patch from github via fetchurl is not possible, because the upstream patch includes some doc changes, which cause our build to fail. We could fix that by adding new dependencies to rebuild the docs... but it's easier to just keep the patch in nixpkgs for 1-2 months.

TLDR: The patches have been slightly modified from upstream, removing the docs changes.

@Ma27

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@Ma27
Copy link
Member

Ma27 commented Sep 15, 2024

Thanks!
Will try to review/merge both of your PRs today :)

@alyssais
Copy link
Member

Applying the patch from github via fetchurl is not possible, because the upstream patch includes some doc changes, which cause our build to fail.

We can't use fetchpatch's exclude argument?

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.
@wolfgangwalther
Copy link
Contributor Author

We can't use fetchpatch's exclude argument?

TIL. Much better, thanks.

@Ma27 Ma27 merged commit 9387bb8 into NixOS:staging Sep 15, 2024
22 of 26 checks passed
@wolfgangwalther wolfgangwalther deleted the postgresql-tzdata branch September 15, 2024 21:13
vcunat pushed a commit that referenced this pull request Nov 4, 2024
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)
This was referenced Jan 20, 2025
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.

4 participants