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.

Sign up for GitHub

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

Jump to bottom

nix: simplify overrides, move out libgit2 patches #363834

Open
wants to merge 4 commits into
base: staging
Choose a base branch
from
Open

nix: simplify overrides, move out libgit2 patches #363834

wants to merge 4 commits into from

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Dec 10, 2024

Things done

Depends on #363831

  • 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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@Mic92
Copy link
Member Author

Mic92 commented Dec 10, 2024

cc @SuperSandro2000 for libgit2

SuperSandro2000
SuperSandro2000 reviewed Dec 10, 2024
View reviewed changes
Copy link
Member

@SuperSandro2000 SuperSandro2000 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the patches being upstreamed? I don't want to maintain them and they look bigger than the one off line change I could fix myself.

@Mic92
Copy link
Member Author

Mic92 commented Dec 10, 2024

Are the patches being upstreamed? I don't want to maintain them and they look bigger than the one off line change I could fix myself.

Yes. Both are upstreamed. We are waiting for a release for a few months. The maintainer promised some time ago, he would "soon" do a new release...

@flokli
Copy link
Contributor

flokli commented Dec 12, 2024

With #363831 merged, is this still a draft?

@Mic92
Copy link
Member Author

Mic92 commented Dec 12, 2024

With #363831 merged, is this still a draft?

Have to run a nixpkgs-review on it for all platforms. That's the main reason.

@Mic92 Mic92 marked this pull request as ready for review December 13, 2024 17:58
@Mic92
Copy link
Member Author

Mic92 commented Dec 13, 2024

Undrafting, but I still haven't run the nixpkgs-review.

@Mic92 Mic92 force-pushed the nix-cleanup2 branch 2 times, most recently from bf347ec to e3f534f Compare December 15, 2024 20:44
Mic92 added 4 commits December 16, 2024 09:52
@Mic92
libgit2: apply patches used in nix by default
250fffe 
They have been extensivly exercised and since nix is present on many
systems, it seems a waste to maintain two libgit2 builds, when we can
have one.
@Mic92
nix: simplify conditional overrides for boehmgc and aws-sdk-cpp
68ac674
@Mic92
nix: localize boehmgc/aws-sdk-cpp overrides
ba5dc5a
@Mic92
pkgsStatic.git: disable failing test
eb120e4
@Mic92 Mic92 changed the base branch from master to staging December 16, 2024 08:53
@Mic92
Copy link
Member Author

Mic92 commented Dec 16, 2024

After fixing static git, it seems that the make buildsystem for nix static breaks because too many arguments are passed. I will leave this part unfixed for now since it's not a new issue and we are in the process of switching to meson.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@edolstra edolstra Awaiting requested review from edolstra

@lovesegfault lovesegfault Awaiting requested review from lovesegfault

@SuperSandro2000 SuperSandro2000 Awaiting requested review from SuperSandro2000

@Artturin Artturin Awaiting requested review from Artturin

@flokli flokli Awaiting requested review from flokli

@Ericson2314 Ericson2314 Awaiting requested review from Ericson2314

@fricklerhandwerk fricklerhandwerk Awaiting requested review from fricklerhandwerk

@RaitoBezarius RaitoBezarius Awaiting requested review from RaitoBezarius

@roberth roberth Awaiting requested review from roberth

@tomberek tomberek Awaiting requested review from tomberek

Assignees
No one assigned
Labels
10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Mic92 @flokli @SuperSandro2000