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

[Backport release-24.05] nixos/gitlab: replace git package with bundled git #329631

Merged
merged 3 commits into from
Jul 25, 2024
Merged

[Backport release-24.05] nixos/gitlab: replace git package with bundled git #329631

merged 3 commits into from
Jul 25, 2024

Conversation

xanderio
Copy link
Contributor

Description of changes

Backport of #328887

I've dropped 9ea4856 as I wasn't sure how to handle the release notes entry. Should I add this to the 24.05 release notes?

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.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jul 24, 2024
@ofborg ofborg bot requested review from yayayayaka, krav, globin and talyz July 24, 2024 11:42
@yayayayaka @xanderio
nixos/gitlab: Replace git package with bundled git
a289083 
This commit switches gitaly's git package from `pkgs.git` to the bundled
`git` package in order to maintain compatibility with the supported git
release by gitaly.

(cherry picked from commit feeb53a)
@yayayayaka @xanderio
nixosTests.gitlab: add git package
fcc9db9 
(cherry picked from commit 66f9d60)
@xanderio xanderio force-pushed the backport-328887-to-release-24.05 branch from 3a994f4 to fcc9db9 Compare July 25, 2024 15:57
@xanderio xanderio requested a review from yayayayaka July 25, 2024 15:57
@yayayayaka yayayayaka merged commit 290dd59 into NixOS:release-24.05 Jul 25, 2024
22 of 25 checks passed
@xanderio xanderio deleted the backport-328887-to-release-24.05 branch July 26, 2024 10:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yayayayaka yayayayaka yayayayaka approved these changes

@krav krav Awaiting requested review from krav

@globin globin Awaiting requested review from globin

@talyz talyz Awaiting requested review from talyz

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@xanderio @yayayayaka