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

Jump to bottom

Merge pull request #77704 from mayflower/also-submodules #77704

Merged
merged 1 commit into from Jan 15, 2020
Merged

Merge pull request #77704 from mayflower/also-submodules #77704

merged 1 commit into from Jan 15, 2020

Conversation

elseym
Copy link
Member

@elseym elseym commented Jan 14, 2020

Motivation for this change

Adds handling for relative references from .git-files, fixing a bug introduced by c9214c3.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

cc @tekeri

@elseym
lib.commitIdFromGitRepo: fix support for git-submodule
9d396d2 
Adds handling for relative references from .git-files, fixing a bug introduced by c9214c3.
@elseym
Copy link
Member Author

elseym commented Jan 14, 2020

see #77473 (comment)

infinisil
infinisil approved these changes Jan 15, 2020
View reviewed changes
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

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

Looking good, fixes the problem with my own config :)

@infinisil infinisil changed the title lib.commitIdFromGitRepo: fix support for git-submodule Merge pull request #77704 from mayflower/also-submodules Jan 15, 2020
@infinisil infinisil merged commit 3c2e9fa into NixOS:master Jan 15, 2020
@elseym elseym deleted the also-submodules branch January 16, 2020 10:41
@colemickens colemickens mentioned this pull request Apr 20, 2020
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil infinisil approved these changes

@edolstra edolstra Awaiting requested review from edolstra

@nbp nbp Awaiting requested review from nbp

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@elseym @infinisil