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

qmapshack: 1.12.3 -> 1.13.0 #63830

Merged
merged 1 commit into from Jun 28, 2019
Merged

qmapshack: 1.12.3 -> 1.13.0 #63830

merged 1 commit into from Jun 28, 2019

Conversation

sikmir
Copy link
Member

@sikmir sikmir commented Jun 26, 2019 •
edited

Motivation for this change

Changelog:

V 1.13.0

  • Live GPS data
  • Add waypoint summary to project details
  • Route history is buggy and causes data loss when auto-routing is enabled
  • Suppress ascent/descent if wrong
  • Partially: Support for PROJ 6.0.0
  • Add Geocaching Attributes
  • Mega-fancy tour description on screen
  • Project Details: Add track points with additional information to lists
  • Garmin Map: Fixing elevation marks
  • Waypoint: copy coordinate to clipboard

Patches originated from:

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

@ofborg ofborg bot requested a review from dotlambda June 26, 2019 21:43
@markuskowa
Copy link
Member

Please use fetchpatch or fetchurl to insert the two patches. From the header it appears that they are directly pulled from a URL. There is no need to host them in nixpkgs when they are available for direct download.

@risicle
Copy link
Contributor

risicle commented Jun 27, 2019

nox-review builds, non-nixos linux x86_64

@sikmir
Copy link
Member Author

sikmir commented Jun 27, 2019

Please use fetchpatch or fetchurl to insert the two patches. From the header it appears that they are directly pulled from a URL. There is no need to host them in nixpkgs when they are available for direct download.

Fixed.

@markuskowa
Copy link
Member

markuskowa commented Jun 27, 2019 •
edited

@GrahamcOfBorg build qmapshack

@markuskowa
Copy link
Member

Looks like there's mismatch of the patch hash values now.

@sikmir
Copy link
Member Author

sikmir commented Jun 27, 2019

Looks like there's mismatch of the patch hash values now.

$ nix-prefetch-url https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindPROJ4.patch
[0.0 MiB DL]
path is '/nix/store/ihfqdjz7in3zk9xigfi1ahk12bhj3nmy-FindPROJ4.patch'
0vflc2rd17d6fwixah6xjpzm0a2nnn7qxi7cizm40mjfjwhlrwv4
$ nix-prefetch-url https://bitbucket.org/maproom/qmapshack/raw/d0b1b595578a83fda981ccc1ff24166fa636ba1d/FindQuaZip5.patch
[0.0 MiB DL]
path is '/nix/store/rds4iw1cd74l26964060a23gjyb0wvb1-FindQuaZip5.patch'
0wbh76zgk1ifx3dmjg7kq96krg53pvp2w3pv1gx721v3d9biw4jr

@markuskowa
Copy link
Member

I think nix-prefetch-url only works for fetchurl but not fetchpatch (not sure what the reason was).

@sikmir
Copy link
Member Author

sikmir commented Jun 27, 2019

But my local nix-build -A qmapshack shows no mismatch errors, what is the reason?

@markuskowa
Copy link
Member

Because you have them in the store after executing nix-prefetch-url. Nix then only looks at the hash and gets a positive match. I does not try to re-download them.

@sikmir
Copy link
Member Author

sikmir commented Jun 27, 2019

I see, fixed.

@markuskowa markuskowa merged commit cb9840f into NixOS:master Jun 28, 2019
@sikmir sikmir deleted the update-qmapshack branch June 28, 2019 08:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dotlambda dotlambda Awaiting requested review from dotlambda

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

Successfully merging this pull request may close these issues.

None yet
3 participants
@sikmir @markuskowa @risicle