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

dash: fix compilation on darwin #93585

Merged
merged 1 commit into from Jul 27, 2020
Merged

dash: fix compilation on darwin #93585

merged 1 commit into from Jul 27, 2020
+46 −1

Conversation

adrian-gierakowski
Copy link
Contributor

Motivation for this change

it's been broken since: adbace3
see: https://hydra.nixos.org/job/nixpkgs/trunk/dash.x86_64-darwin

NOTE: this is a quickfix until a patch is accepted upstream

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.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 10.rebuild-darwin: 1-10 10.rebuild-linux: 0 labels Jul 21, 2020
@sikmir
Copy link
Member

sikmir commented Jul 21, 2020

NOTE: this is a quickfix until a patch is accepted upstream

Am I right, that this patch is available somewhere online? If that's true it should be retrieved using fetchpatch.

@adrian-gierakowski
Copy link
Contributor Author

NOTE: this is a quickfix until a patch is accepted upstream

Am I right, that this patch is available somewhere online? If that's true it should be retrieved using fetchpatch.

@sikmir it exists only in my fork of nixpkgs, but I'm planning to submit it to dash@vger.kernel.org where development of dash happens. I submitted a PR here first since what I care most about is to have it fixed in nixpkgs and I don't know how long it is going to take to have it included as part of an upstream release

@adrian-gierakowski adrian-gierakowski mentioned this pull request Jul 21, 2020
Closed
@adrian-gierakowski
Copy link
Contributor Author

any chance of getting this merged?

This was referenced Jul 24, 2020
Merged
Merged
purcell
purcell approved these changes Jul 26, 2020
View reviewed changes
Copy link
Member

@purcell purcell left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@LnL7 LnL7 merged commit 8ae686d into NixOS:master Jul 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@purcell purcell purcell approved these changes

@LnL7 LnL7 LnL7 approved these changes

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@adrian-gierakowski @sikmir @purcell @LnL7 @Janik-Haag