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

[20.09] git-mediate: 1.0.8 -> 1.0.8.1 #102353

Merged
merged 1 commit into from Nov 1, 2020
Merged

[20.09] git-mediate: 1.0.8 -> 1.0.8.1 #102353

merged 1 commit into from Nov 1, 2020

Conversation

KaiHa
Copy link
Contributor

@KaiHa KaiHa commented Nov 1, 2020

After update to 1.0.8.1 git-mediate is buildable again

Motivation for this change
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.

@KaiHa
[20.09] git-mediate: 1.0.8 -> 1.0.8.1
e5aef98 
After update to 1.0.8.1 git-mediate is buildable again
@bhipple
Copy link
Contributor

bhipple commented Nov 1, 2020

Result of nixpkgs-review pr 102353 1

@bhipple bhipple merged commit 567d0e3 into NixOS:release-20.09 Nov 1, 2020
cdepillabout
cdepillabout reviewed Nov 2, 2020
View reviewed changes
pkgs/development/haskell-modules/hackage-packages.nix
@@ -102193,7 +102193,7 @@ self: {
description = "Tool to help resolving git conflicts";
license = stdenv.lib.licenses.gpl2;
hydraPlatforms = stdenv.lib.platforms.none;
Copy link
Member

Choose a reason for hiding this comment

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

@KaiHa @bhipple You also have to remove this hydraPlatforms = line. If you don't, then Hydra will not build this package. You'll always have to build it locally.

Please send a follow-up PR removing this line.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@cdepillabout @bhipple Done, you can find my PR here.

@KaiHa KaiHa deleted the pr/unbreak-git-mediate-backport branch November 2, 2020 15:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout cdepillabout left review comments

@bhipple bhipple bhipple approved these changes

Assignees
No one assigned
Labels
6.topic: haskell 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
3 participants
@KaiHa @bhipple @cdepillabout