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

Git: v2.47.1 -> v2.48.0 #372782

Closed
wants to merge 1,094 commits into from
Closed

Git: v2.47.1 -> v2.48.0 #372782

wants to merge 1,094 commits into from
+19,675 −11,413

Conversation

me-and
Copy link
Contributor

@me-and me-and commented Jan 10, 2025

Changelog: https://github.com/gitster/git/blob/v2.48.0/Documentation/RelNotes/2.48.0.txt

This also includes one commit from #370888, which is necessary for the build to complete.

No substantial changes that affect backwards compatibility AFAICS, so I don't think there's a need for a release note.

Haven't tested all executables in bin/, but I did check git --version as a quick test on top of the test suite and that's fine. Builds of nixosTests.gitdaemon, git.passthru.tests and tests.fetchgit, as safety checks, are on my system now.

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/)
  • 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.

emilazy and others added 30 commits January 5, 2025 18:29
@emilazy
qt6.qtwayland: backport fix for qtwayland compositor (NixOS#370520)
2ae6bd9
@emilazy
oniguruma: 6.9.9 -> 6.9.10 (NixOS#369960)
47fb826
@emilazy
fontforge: fix dejavu_fonts compilation on darwin, enable Python 3.13…
2bec4f1 
… support (NixOS#371027)
@emilazy
nettle: 3.10.0 -> 3.10.1 (NixOS#369579)
6ad26d1
@emilazy
python312Packages.re-assert: refactor (NixOS#369879)
e6bec8a
@emilazy
kbd: 2.6.4 -> 2.7.1 (NixOS#369337)
6936cd7
@emilazy
cc-wrapper: Unconditionally warn about skipped native flags (NixOS#20…
c648235 
…3675)
@emilazy
python312Packages.appdirs: fix typo (NixOS#369422)
8d4d53d
@jtojnar
sysprof: 47.0 → 47.2
51853c0 
https://gitlab.gnome.org/GNOME/sysprof/-/compare/47.0...47.2
@jtojnar
gtk4: 4.16.3 → 4.16.7
8efc701 
https://gitlab.gnome.org/GNOME/gtk/-/compare/4.16.3...4.16.7
@jtojnar
pango: 1.54.0 → 1.55.5
a1ce675 
https://gitlab.gnome.org/GNOME/pango/-/compare/1.54.0...1.55.5
@emilazy
libcamera: 0.3.2 -> 0.4.0 (NixOS#368073)
63cd447
@emilazy
netpbm: 11.8.2 -> 11.9.0 (NixOS#369011)
9ab8680
@emilazy
wayland-protocols: 1.38 -> 1.39 (NixOS#367589)
487904e
@emilazy
xorg.libSM: 1.2.4 -> 1.2.5 (NixOS#367028)
098ad57
@emilazy
xorg.libICE: 1.1.1 -> 1.1.2 (NixOS#367601)
066f909
@emilazy
linuxHeaders: 6.12 -> 6.12.7 (NixOS#369357)
198963b
@emilazy
xxHash: 0.8.2 -> 0.8.3 (NixOS#369300)
fad5870
@emilazy
spdlog: 1.14.1 -> 1.15.0 (NixOS#354975)
6572dba
@r-ryantm @emilazy
mupdf: 1.24.11 -> 1.25.2
421330f
@emilazy
python312Packages.pymupdf: 1.24.14 -> 1.25.1
d7dae14 
Diff: pymupdf/PyMuPDF@refs/tags/1.24.14...1.25.1

Changelog: https://github.com/pymupdf/PyMuPDF/releases/tag/1.25.1
@emilazy
python312Packages.pymupdf: set PYMUPDF_SYSINSTALL_TEST
62dcd29
@FliegendeWurst
python313Packages.websockets: disable failing test, cleanup
f5097a6
@emilazy
glog: 0.6.0 -> 0.7.1 (NixOS#364543)
dcc38ce
@emilazy
memcached: 1.6.31 -> 1.6.34 (NixOS#362219)
c058e55
@emilazy
fluidsynth: 2.3.7 -> 2.4.2 (NixOS#358133)
3b57b19
@emilazy
python313Packages.websockets: disable failing test (NixOS#371123)
3f87b97
@emilazy
mupdf: 1.24.11 -> 1.25.2 (NixOS#369410)
7ea4730
@emilazy
flatbuffers: 24.3.25 -> 24.12.23 (NixOS#367789)
ee88d6f
@emilazy
liburcu: 0.14.1 -> 0.15.0 (NixOS#366968)
c313aa1
@github-actions github-actions bot added 6.topic: python 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: haskell 6.topic: qt/kde 6.topic: kernel The Linux kernel 8.has: documentation This PR adds or changes documentation 8.has: changelog 8.has: module (update) This PR changes an existing module in `nixos/` 6.topic: emacs Text editor 6.topic: rust 6.topic: golang 6.topic: vim 6.topic: ocaml 6.topic: fetch 6.topic: stdenv Standard environment 6.topic: nodejs 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: systemd 6.topic: julia 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: dotnet Language: .NET 6.topic: flutter 6.topic: nvidia labels Jan 10, 2025
@me-and
Copy link
Contributor Author

me-and commented Jan 10, 2025

PR into wrong branch. Closing now with apologies for the noise.

@me-and me-and closed this Jan 10, 2025
@nix-owners
Copy link

nix-owners bot commented Jan 10, 2025

The PR's base branch is set to master, but 1092 commits from the staging branch are included. Make sure you know the right base branch for your changes, then:

  • If the changes should go to the staging branch, change the base branch to staging
  • If the changes should go to the master branch, rebase your PR onto the merge base with the master branch: 
    # git rebase --onto $(git merge-base upstream/master HEAD) $(git merge-base upstream/staging HEAD)
git rebase --onto 3f14b8543b706eefcc086b69c744f3e0445806dc 008195f69b3a6f7d06c8c8b1df12c080261fcd79
git push --force-with-lease

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: dotnet Language: .NET 6.topic: emacs Text editor 6.topic: fetch 6.topic: flutter 6.topic: golang 6.topic: haskell 6.topic: julia 6.topic: kernel The Linux kernel 6.topic: llvm/clang Issues related to llvmPackages, clangStdenv and related 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: nodejs 6.topic: nvidia 6.topic: ocaml 6.topic: python 6.topic: qt/kde 6.topic: rust 6.topic: stdenv Standard environment 6.topic: systemd 6.topic: TeX Issues regarding texlive and TeX in general 6.topic: vim 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 5001+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.