Skip to content

Comments

git: 2.35.3 -> 2.36.0#169223

Merged
lovesegfault merged 1 commit intoNixOS:stagingfrom
techknowlogick:bump-git
Apr 19, 2022
Merged

git: 2.35.3 -> 2.36.0#169223
lovesegfault merged 1 commit intoNixOS:stagingfrom
techknowlogick:bump-git

Conversation

@techknowlogick
Copy link
Member

@techknowlogick techknowlogick commented Apr 18, 2022 •
edited
Loading

Description of changes

https://github.blog/2022-04-18-highlights-from-git-2-36/

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/)
  • 22.05 Release Notes (or backporting 21.11 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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@lovesegfault
Copy link
Member

lovesegfault commented Apr 18, 2022

This will certainly have to target staging

@ofborg ofborg bot requested review from globin, primeos and wmertens April 18, 2022 18:44
@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Apr 18, 2022
@techknowlogick techknowlogick changed the base branch from master to staging April 18, 2022 19:02
@techknowlogick
Copy link
Member Author

techknowlogick commented Apr 18, 2022

This will certainly have to target staging

@lovesegfault rebased onto staging :)

mweinelt
mweinelt approved these changes Apr 18, 2022
View reviewed changes
Copy link
Member

@mweinelt mweinelt left a comment

Choose a reason for hiding this comment

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

Tested gitMinimal and gitFull on both aarch64-linux and x86_64-linux.

@lovesegfault lovesegfault merged commit cef5577 into NixOS:staging Apr 19, 2022
@techknowlogick techknowlogick deleted the bump-git branch April 19, 2022 01:36
@vcunat
Copy link
Member

vcunat commented Apr 25, 2022

It won't build on aarch64-darwin: https://hydra.nixos.org/build/174700755

Maybe a simple addition of a dependency will suffice; say could someone from @NixOS/darwin-maintainers have a look?

@winterqt
Copy link
Member

winterqt commented Apr 25, 2022

I'd make a patch but I can't right now -- but the fix is to add the CoreServices framework as a dependency. See how we handle adding it in callPackage; if nobody else makes a patch I'll do it when I can.

@vcunat
Copy link
Member

vcunat commented Apr 25, 2022 •
edited
Loading

I had guessed so, but I don't have a means to verify. (@ofBorg probably can't do it due to stdenv rebuild)

@reckenrode
Copy link
Contributor

reckenrode commented Apr 25, 2022

@winterqt @vcunat I created #170291 with the fix (add CoreServices framework). I didn’t add it to callPackage because I didn’t want to risk breaking anything since git is used in quite a few places with different git packages.

@reckenrode reckenrode mentioned this pull request Apr 25, 2022
Merged
13 tasks
@vcunat
Copy link
Member

vcunat commented Apr 27, 2022

And tests... I suppose well have to disable one, at least on aarch64-darwin? (the other three built OK)
https://hydra.nixos.org/build/174778232

@vcunat
Copy link
Member

vcunat commented May 1, 2022

For reference, done in 9b64158

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

Reviewers

@mweinelt mweinelt mweinelt approved these changes

@globin globin Awaiting requested review from globin

@primeos primeos Awaiting requested review from primeos

@wmertens wmertens Awaiting requested review from wmertens

@FRidh FRidh Awaiting requested review from FRidh

@jonringer jonringer Awaiting requested review from jonringer

@edolstra edolstra Awaiting requested review from edolstra

@fpletz fpletz Awaiting requested review from fpletz

@fabaff fabaff Awaiting requested review from fabaff

@hakuch hakuch Awaiting requested review from hakuch

@markuskowa markuskowa Awaiting requested review from markuskowa

Assignees

No one assigned

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 5001+ This PR causes many rebuilds on Darwin and must target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@techknowlogick @lovesegfault @vcunat @winterqt @reckenrode @mweinelt