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

nixVersions.nix_2_9: pull patch to add missing git-dir flags #177353

Merged
merged 1 commit into from
Jun 12, 2022

Conversation

Artturin
Copy link
Member

Description of changes

unstable updated yesterday

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

Copy link
Contributor

@thiagokokada thiagokokada left a comment

Choose a reason for hiding this comment

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

Should/could we backport this to nix_2_8 version, especially with release-22.05?

@ncfavier
Copy link
Member

No need as this fixes a problem introduced in 2.9.

@thiagokokada
Copy link
Contributor

thiagokokada commented Jun 12, 2022

I thought this problem was introduced with git 2.35.2 and affects all version of nix.

@ncfavier
Copy link
Member

It's a bit complicated, see NixOS/nix#6643 (comment): the problem was fixed in Nix 2.8, then a conflicting merge destroyed part of the fix so the problem reappeared in Nix 2.9, and that patch restores the original fix.

@thiagokokada
Copy link
Contributor

It's a bit complicated, see NixOS/nix#6643 (comment): the problem was fixed in Nix 2.8, then a conflicting merge destroyed part of the fix so the problem reappeared in Nix 2.9, and that patch restores the original fix.

Ah ok, makes sense them.

@Mindavi Mindavi merged commit ccc4dc5 into NixOS:master Jun 12, 2022
@Artturin Artturin deleted the nixudpate11 branch June 12, 2022 13:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants