Skip to content

merkaartor: unstable-2019-11-12 -> unstable-2020-07-07, build with latest libsForQt5#108476

Closed
erictapen wants to merge 1 commit intoNixOS:masterfrom
erictapen:merkaartor-unstable-2020-07-07
Closed

merkaartor: unstable-2019-11-12 -> unstable-2020-07-07, build with latest libsForQt5#108476
erictapen wants to merge 1 commit intoNixOS:masterfrom
erictapen:merkaartor-unstable-2020-07-07

Conversation

@erictapen
Copy link
Member

Motivation for this change

Fix merkaartor build on nixos-unstable.

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.

…test libsForQt5

also added myself as maintainer
@erictapen erictapen requested a review from adisbladis January 5, 2021 12:47
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jan 5, 2021
@ymarkus ymarkus added the 8.has: package (update) This PR updates a package to a newer version label Jan 5, 2021
@SuperSandro2000
Copy link
Member

@erictapen please fix the merge conflict

@SuperSandro2000 SuperSandro2000 added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 6, 2021
@erictapen
Copy link
Member Author

Was solved in bc797e2.

@erictapen erictapen closed this Jan 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 8.has: package (update) This PR updates a package to a newer version 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants