Skip to content

[next] libgit2_1_6: init at 1.6.4#247408

Merged
vcunat merged 5 commits intoNixOS:staging-nextfrom
figsoda:libgit2
Aug 7, 2023
Merged

[next] libgit2_1_6: init at 1.6.4#247408
vcunat merged 5 commits intoNixOS:staging-nextfrom
figsoda:libgit2

Conversation

@figsoda
Copy link
Copy Markdown
Member

@figsoda figsoda commented Aug 5, 2023

Some packages still depend on libgit2 1.6

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 23.11 Release Notes (or backporting 23.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.

@github-actions github-actions bot added the 6.topic: python Python is a high-level, general-purpose programming language. label Aug 5, 2023
@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label Aug 5, 2023
@ofborg ofborg bot requested a review from SuperSandro2000 August 5, 2023 23:18
@ofborg ofborg bot added 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Aug 5, 2023
@ofborg ofborg bot requested review from Azd325 and evanrichter August 5, 2023 23:24
@linsui
Copy link
Copy Markdown
Contributor

linsui commented Aug 6, 2023

Could you please also add jami to this MR? I thought it also requires libgit2 2.16. See https://hydra.nixos.org/build/229965246.

@ofborg ofborg bot requested review from Azd325 and linsui August 6, 2023 15:14
@linsui linsui mentioned this pull request Aug 6, 2023
12 tasks
@vcunat
Copy link
Copy Markdown
Member

vcunat commented Aug 7, 2023

jami got fixed by fa3ea76 and builds already: https://hydra.nixos.org/build/230406259

@vcunat
Copy link
Copy Markdown
Member

vcunat commented Aug 7, 2023

Same with all the other packages in this PR as well, so I assume this PR won't be needed anymore.

gql still fails on *-darwin but that probably won't get helped by libgit2 changes (instead, the Security framework should be provided)

@vcunat vcunat closed this Aug 7, 2023
@figsoda figsoda reopened this Aug 7, 2023
@figsoda
Copy link
Copy Markdown
Member Author

figsoda commented Aug 7, 2023

gql still fails on *-darwin but that probably won't get helped by libgit2 changes (instead, the Security framework should be provided)

It requires the Security framework when used with libgit2 1.7 because it is falling back to the vendored version of libgit2 and is not using the libgit2 dependency at all: #247398 (comment). This patch fixes it on darwin as shown by ofborg.

Same with all the other packages in this PR as well, so I assume this PR won't be needed anymore.

Same for gex, which was already fixed by adding the Security framework, but this is a better fix because the libgit2 dependency actually does something

The same applies to nix-init. The package already builds, but was not linking to libgit2, and downgrading libgit2 fixes the linking issue.

pygit2 is already using libgit2 1.6, I just lifted the override to top level

I will remove jami since that seems to be caused by a libgit2 bug that has been patched now

@ofborg ofborg bot requested a review from Azd325 August 7, 2023 14:32
@vcunat vcunat merged commit 2d99077 into NixOS:staging-next Aug 7, 2023
@figsoda figsoda deleted the libgit2 branch August 7, 2023 14:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: python Python is a high-level, general-purpose programming language. 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 This PR causes between 11 and 100 packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants