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

irrd: 4.4.2 -> 4.4.4; fix build #319522

Merged
merged 1 commit into from
Jun 13, 2024
Merged

irrd: 4.4.2 -> 4.4.4; fix build #319522

merged 1 commit into from
Jun 13, 2024

Conversation

yu-re-ka
Copy link
Contributor

@yu-re-ka yu-re-ka commented Jun 13, 2024

Description of changes

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.

@yu-re-ka yu-re-ka added the backport release-24.05 Backport PR automatically label Jun 13, 2024
@superherointj
Copy link
Contributor

superherointj commented Jun 13, 2024

Suggestions:

  • Move package from top-level to by-name.
  • On following phases order (execution order):
    • postPatch is out of phases order.
    • pythonRelaxDeps is either patch phase or configure phase (it edit files), I'd put it in between patch/configure.
  • Remove nested with at meta. [optional]
  • commit message: fix build should be at body. (I can squash it, in case you don't feel like it.)

Self-promotion:

@superherointj
Copy link
Contributor

superherointj commented Jun 13, 2024

Result of nixpkgs-review pr 319522 run on x86_64-linux 1

2 packages failed to build:
  • irrd
  • irrd.dist

Failure could be specific to my host, idk yet. This is second build that fails.

@yu-re-ka
Copy link
Contributor Author

No, some tests are still failing. I'm working on it.

@yu-re-ka
Copy link
Contributor Author

@superherointj where is this order you are referring to defined?

@superherointj
Copy link
Contributor

superherointj commented Jun 13, 2024

@superherointj where is this order you are referring to defined?

image
https://nixos.org/manual/nixpkgs/stable/#sec-stdenv-phases

By defined, if you meant mandatory, I don't know, likely isn't. But it is usual to list entries by phases order which is the order of execution. The phases are hooks that happens in sequence. Errors also shows up in sequence too. In case, you don't want to do this, no problem.

@yu-re-ka yu-re-ka force-pushed the irrd branch 2 times, most recently from 7b218f3 to 01b8c92 Compare June 13, 2024 11:19
@yu-re-ka
Copy link
Contributor Author

I think the phases/definitions should be in order of execution now. If not, tell me what I need to change.

Also the build is fixed now.

@yu-re-ka yu-re-ka marked this pull request as ready for review June 13, 2024 11:20
@yu-re-ka
Copy link
Contributor Author

Remove nested with at meta. [optional]

I disagree, I prefer the with; syntax as-is.

commit message: fix build should be at body. (I can squash it, in case you don't feel like it.)

I disagree. The commit does two things at once and both should be visible from reading the first line.

@superherointj
Copy link
Contributor

Result of nixpkgs-review pr 319522 run on x86_64-linux 1

2 packages built:
  • irrd
  • irrd.dist

@superherointj
Copy link
Contributor

I disagree, I prefer the with; syntax as-is.

Not a blocker. But to clarify, nested with suggestion is not based on syntax, but in avoiding issues in static analysis and some quirks like:
#292468 (comment)

@yu-re-ka yu-re-ka merged commit 18214ff into NixOS:master Jun 13, 2024
22 of 24 checks passed
Copy link
Contributor

Successfully created backport PR for release-24.05:

@yu-re-ka yu-re-ka deleted the irrd branch June 13, 2024 15:28
jleightcap pushed a commit to jleightcap/nixpkgs that referenced this pull request Jun 13, 2024
diniamo pushed a commit to diniamo/nixpkgs that referenced this pull request Jun 17, 2024
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.

None yet

2 participants