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

libgit2: 1.7.2 -> 1.8.1; python312Packages.pygit2: 1.14.1 -> 1.15.0 #317275

Merged
merged 3 commits into from
Aug 1, 2024
Merged

libgit2: 1.7.2 -> 1.8.1; python312Packages.pygit2: 1.14.1 -> 1.15.0 #317275

merged 3 commits into from
Aug 1, 2024

Conversation

eclairevoyant
Copy link
Contributor

@eclairevoyant eclairevoyant commented Jun 4, 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.

@eclairevoyant eclairevoyant added 1.severity: security Issues which raise a security issue, or PRs that fix one 5. scope: tracked Issue (or PR) is linked back to a `5. scope: tracking` issue labels Jun 4, 2024
@eclairevoyant eclairevoyant marked this pull request as draft June 4, 2024 19:19
@eclairevoyant eclairevoyant added 8.has: package (update) This PR updates a package to a newer version 8.has: clean-up labels Jun 4, 2024
@ofborg ofborg bot requested a review from SuperSandro2000 June 4, 2024 20:44
@eclairevoyant eclairevoyant changed the title libgit2: 1.7.2 -> 1.8.1; reformat libgit2: 1.7.2 -> 1.8.1 Jun 4, 2024
@ofborg ofborg bot requested a review from SuperSandro2000 June 4, 2024 21:54
@eclairevoyant eclairevoyant changed the title libgit2: 1.7.2 -> 1.8.1 libgit2: 1.7.2 -> 1.8.1; python312Packages.pygit2: 1.14.1 -> 1.15.0 Jun 4, 2024
@ofborg ofborg bot requested review from bobby285271, jtojnar, dasj19 and hedning June 5, 2024 00:16
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.

LGTM, please test the reverse deps enough to not cause to many breakges

@eclairevoyant
Copy link
Contributor Author

please test the reverse deps enough to not cause to many breakges

unfortunately there are lots of breakages, I'm trying to go through them when I get a chance, hence left the PR in draft for now

@SuperSandro2000
Copy link
Member

I meant the key reverse deps listed in passthru 😅

@eclairevoyant eclairevoyant marked this pull request as ready for review July 19, 2024 06:59
@ofborg ofborg bot requested a review from SuperSandro2000 July 20, 2024 01:25
@ofborg ofborg bot requested a review from jtojnar July 20, 2024 01:25
@SuperSandro2000 SuperSandro2000 merged commit dd7ceab into NixOS:staging Aug 1, 2024
26 checks passed
@eclairevoyant eclairevoyant deleted the libgit2 branch August 1, 2024 12:57
@trofi
Copy link
Contributor

trofi commented Aug 2, 2024

Bisect claims that 602760c libgit2: fix incorrect recursive structure in tests broke the eval of libgit2.tests in staging as:

$ nix build --no-link -f. libgit2.tests

error:
       … while calling a functor (an attribute set with a '__functor' attribute)
         at pkgs/development/libraries/libgit2/default.nix:73:40:
           72|
           73|   passthru.tests = lib.mapAttrs (_: v: v.override { libgit2 = finalAttrs.finalPackage; }) {
             |                                        ^
           74|     inherit libgit2-glib;

       … while calling a functor (an attribute set with a '__functor' attribute)
         at lib/customisation.nix:144:43:
          143|       # Re-call the function but with different arguments
          144|       overrideArgs = mirrorArgs (newArgs: makeOverridable f (overrideWith newArgs));
             |                                           ^
          145|       # Change the result of the function call by applying g to it

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: function 'anonymous lambda' called with unexpected argument 'libgit2'
       at pkgs/applications/version-management/gitstatus/default.nix:1:1:
            1| { callPackage, lib, stdenv, fetchFromGitHub, git, zsh }:
             | ^
            2|

I think it says that gitstatus does not have an immediate libgit2 input.

@eclairevoyant
Copy link
Contributor Author

Thanks for catching.
And yikes, how would we even override that? it's coming in via buildInputs = [ (callPackage ./romkatv_libgit2.nix { }) ]; which in turn has a libgit2 input...

@SuperSandro2000
Copy link
Member

I try to take a look at this later today

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.severity: security Issues which raise a security issue, or PRs that fix one 5. scope: tracked Issue (or PR) is linked back to a `5. scope: tracking` issue 6.topic: python 8.has: clean-up 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 501-1000 10.rebuild-darwin: 501+ 10.rebuild-linux: 501+ 10.rebuild-linux: 1001-2500
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants