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

git: 2.19.2 -> 2.21.0 #56376

Merged
merged 1 commit into from Mar 15, 2019
Merged

git: 2.19.2 -> 2.21.0 #56376

merged 1 commit into from Mar 15, 2019

Conversation

@artemist
Copy link
Member

artemist commented Feb 25, 2019

Motivation for this change

Git 2.19.2 is out of date

Things done

I modified default.nix, then rebased all patches onto git 2.21.0. I had to make significant modifications to git-sh-i18n.patch to allow it to pass tests. All tests pass for gitFull and git-annex, which relies on gitBase. I have nowhere near the computing power to test all reliant packages, however. This commit was made using this updated git.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

Copy link
Contributor

xeji left a comment

Please rebase this PR on the staging branch since it causes a mass rebuild of "nearly everything" (I'm exaggerating here..)

@artemist artemist force-pushed the artemist:git-2.21.0 branch from 63f6a6b to fc917e5 Feb 25, 2019
@artemist artemist changed the base branch from master to staging Feb 25, 2019
@xeji

This comment has been minimized.

Copy link
Contributor

xeji commented Feb 25, 2019

Nevermind all these review requests, changing base tends to confuse ofborg a little...

@xeji xeji removed the request for review from matthewbauer Feb 25, 2019
@artemist

This comment has been minimized.

Copy link
Member Author

artemist commented Feb 25, 2019

It's hard to tell if i18n is working properly. My laptop is in German, but only shell utilities would care about the i18n shell patch, and most of these don't have translations. The C i18n is working fine, as my git is still in German, for what it's worth.

@dtzWill

This comment has been minimized.

Copy link
Contributor

dtzWill commented Feb 26, 2019

Thanks for tackling this!

@dtzWill dtzWill mentioned this pull request Feb 26, 2019
2 of 10 tasks complete
@artemist

This comment has been minimized.

Copy link
Member Author

artemist commented Feb 26, 2019

Update: I can confirm i18n is working. git bisect, a shell utility, is translating to my strings into my local language, and shell utilities respond correctly to the test variable, GIT_TEST_GETTEXT_POISON=1.

Additionally, I just rebuilt my system on top of the new git. After around 24h, it fully built and works fine.

@alyssais

This comment has been minimized.

Copy link
Member

alyssais commented Feb 28, 2019

@GrahamcOfBorg build git gitFull

@dtzWill

This comment has been minimized.

Copy link
Contributor

dtzWill commented Mar 15, 2019

@GrahamcOfBorg build git gitFull

@artemist

This comment has been minimized.

Copy link
Member Author

artemist commented Mar 15, 2019

git and gitFull do build on my x86_64 NixOS machine, so it seems that is just a timeout issue. I'm not sure what's happening with MacOS, and don't have a machine I can test on right now.

@xeji

This comment has been minimized.

Copy link
Contributor

xeji commented Mar 15, 2019

Darwin failure looks unrelated, it's just a bunch of dependencies that currently fail on staging. So let's merge this now.

@xeji xeji merged commit bc92dd6 into NixOS:staging Mar 15, 2019
13 checks passed
13 checks passed
git, gitFull on x86_64-darwin Failure
Details
git, gitFull on x86_64-linux Timed out, unknown build status
Details
git, gitFull on aarch64-linux Success
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.