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

gitAndTools.git-annex: fix darwin build #76342

Closed
wants to merge 1 commit into from
Closed

gitAndTools.git-annex: fix darwin build #76342

wants to merge 1 commit into from

Conversation

veprbl
Copy link
Member

@veprbl veprbl commented Dec 24, 2019 •
edited

Motivation for this change

git-annex doesn't build on darwin, I suspect a case of NixOS/nix#1085
Fixes: #73435
Helps with: #40783

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.

@veprbl
Copy link
Member Author

veprbl commented Dec 24, 2019

Should this target "haskell-updates" instead?

@cdepillabout
Copy link
Member

@veprbl Since it only affects Darwin, it is probably fine to merge into master, but we usually merge Haskell-related changes into haskell-updates.

This looks good to me, and it builds on darwin, so I think it is good to merge in.

veprbl added a commit that referenced this pull request Dec 24, 2019
@veprbl
gitAndTools.git-annex: fix darwin build
18c2874 
Closes: #76342
Fixes: #73435
@veprbl
Copy link
Member Author

veprbl commented Dec 24, 2019

Pushed this to the haskell-updates.

@cdepillabout
Copy link
Member

cdepillabout commented Dec 25, 2019 •
edited

This is commit 18c2874 on #75857 for haskell-updates, so I am going ahead and closing this.

Thanks veprbl!

peti pushed a commit that referenced this pull request Dec 26, 2019
@veprbl @peti
gitAndTools.git-annex: fix darwin build
3837d22 
Closes: #76342
Fixes: #73435
peti pushed a commit that referenced this pull request Dec 27, 2019
@veprbl @peti
gitAndTools.git-annex: fix darwin build
c744527 
Closes: #76342
Fixes: #73435
@veprbl veprbl deleted the pr/git-annex_darwin_fix branch December 1, 2020 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marsam marsam marsam approved these changes

@basvandijk basvandijk Awaiting requested review from basvandijk

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

Assignees
No one assigned
Labels
6.topic: darwin Running or building packages on Darwin 6.topic: haskell 10.rebuild-darwin: 1-10 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

git-annex: 5 out of 366 tests failed
3 participants
@veprbl @cdepillabout @marsam