pure-maps: init at 2.6.0 #107836

Thra11 · 2020-12-28T21:03:29Z

Motivation for this change

Pure maps is a great navigation application. While it's main focus is mobile devices (I intend to use it on NixOS Mobile), it works pretty well on the desktop too.

Pure maps has multiple GUI 'flavours', Kirigami, QtControls, Sailfish, & Ubuntu Touch: I have just packaged the kirigami version for the sake of simplicity, but we can always add a flag to choose the flavour later if there's interest.

Things done

SuperSandro2000

I added some new lines to some packages. It would be nice if you could add them to all to make the packages clearer.

.../applications/misc/pure-maps/0001-Do-not-use-QT_HOST_BINS-to-find-lconvert-as-it-is-pa.patch

pkgs/applications/misc/pure-maps/default.nix

SuperSandro2000 · 2020-12-28T22:04:59Z

pkgs/applications/misc/pure-maps/default.nix

+    repo = "pure-maps";
+    rev = version;
+    sha256 = "0xcrjzxnm3zx12ffb8yy87qa6iqga2h6ca6gi05q9xp5p6zg16j0";
+    fetchSubmodules = true;


if we propagate gpxpy do we need to fetch the submodules?

There's at least one other submodule, geomag, which is still required. In theory we could try to de-vendor them all, but I'm not sure it's trivial (for example, in one place, geomag is imported as poor.geomag, rather than as an external module).

I think it would make sense to devendor gpxpy as it is already part of nixpkgs.

pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix

...lopment/libraries/s2geometry/0001-Replace-uint64-with-uint64_t-since-nothing-defines-u.patch

pkgs/development/libraries/s2geometry/default.nix

pkgs/top-level/all-packages.nix

SuperSandro2000 · 2020-12-28T22:43:02Z

Result of nixpkgs-review pr 107836 run on x86_64-linux 1

5 packages built:

mapbox-gl-native
mapbox-gl-qml
nemo-qml-plugin-dbus
pure-maps
s2geometry

pkgs/development/libraries/mapbox-gl-native/default.nix

SuperSandro2000 · 2021-01-07T13:31:38Z

pkgs/development/libraries/mapbox-gl-qml/default.nix

+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ qtlocation mapbox-gl-native ];
+  NIX_CFLAGS_COMPILE = "-I${mapbox-gl-native}/include/qt5";
+  postUnpack = ''


pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix

pkgs/development/libraries/s2geometry/default.nix

SuperSandro2000 · 2021-01-07T16:46:06Z

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 107836 run on x86_64-linux 1

3 packages failed to build and are new build failures:

mapbox-gl-native: log https://hastebin.com/raw/kenuguqacu
mapbox-gl-qml: log was empty
pure-maps: log was empty

2 packages built:

nemo-qml-plugin-dbus
s2geometry

SuperSandro2000 · 2021-01-10T10:30:45Z

This is a semi-automatic executed nixpkgs-review which does not build all packages (e.g. lumo, tensorflow or pytorch)
If you find some bugs or got suggestions for further things to search or run please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 107836 run on x86_64-linux 1

5 packages built:

mapbox-gl-native
mapbox-gl-qml
nemo-qml-plugin-dbus
pure-maps
s2geometry

nixos-discourse · 2021-02-20T19:10:05Z

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/470

SuperSandro2000

Please fix the merge conflict and rename postUnpack to postPatch to not break patches.

SuperSandro2000 · 2021-02-23T19:08:09Z

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 107836 run on x86_64-linux 1

5 packages built:

mapbox-gl-native
mapbox-gl-qml
nemo-qml-plugin-dbus
pure-maps
s2geometry

Thra11 · 2021-02-28T13:07:14Z

/marvin opt-in
/status needs_reviewer

marvin-mk2 · 2021-02-28T13:07:16Z

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

bennyandresen

Based on most on most of the comments and building the package myself and the iterations it already went through, this LGTM.

/status needs_merger

dotlambda · 2021-03-13T11:57:38Z

This doesn't work for me:

"PyOtherSide error: Traceback (most recent call last):\n\n  File \"/nix/store/l3ivd5jwgvvnphbcqbgv4m3qxy4s6mqb-pure-maps-2.6.0/share/pure-maps/poor/__init__.py\", line 42, in <module>\n    from poor import util\n\n  File \"/nix/store/l3ivd5jwgvvnphbcqbgv4m3qxy4s6mqb-pure-maps-2.6.0/share/pure-maps/poor/util.py\", line 24, in <module>\n    import gpxpy.parser\n\nModuleNotFoundError: No module named 'gpxpy'\n"
qml: Error: Cannot import module: poor (Traceback (most recent call last):

  File "/nix/store/l3ivd5jwgvvnphbcqbgv4m3qxy4s6mqb-pure-maps-2.6.0/share/pure-maps/poor/__init__.py", line 42, in <module>
    from poor import util

  File "/nix/store/l3ivd5jwgvvnphbcqbgv4m3qxy4s6mqb-pure-maps-2.6.0/share/pure-maps/poor/util.py", line 24, in <module>
    import gpxpy.parser

ModuleNotFoundError: No module named 'gpxpy'
)
"PyOtherSide error: Traceback (most recent call last):\n\n  File \"<string>\", line 1, in <module>\n\nNameError: name 'poor' is not defined\n"
qml: Error: Function not found: 'poor.main' (Traceback (most recent call last):

  File "<string>", line 1, in <module>

NameError: name 'poor' is not defined
)
"PyOtherSide error: Traceback (most recent call last):\n\n  File \"<string>\", line 1, in <module>\n\nNameError: name 'poor' is not defined\n"
qml: Error: Function not found: 'poor.conf.get_all' (Traceback (most recent call last):

  File "<string>", line 1, in <module>

NameError: name 'poor' is not defined
)
file:///nix/store/l3ivd5jwgvvnphbcqbgv4m3qxy4s6mqb-pure-maps-2.6.0/share/pure-maps/qml/Config.qml:171: TypeError: Cannot read property 'auto_complete_geo' of undefined
"PyOtherSide error: Traceback (most recent call last):\n\n  File \"<string>\", line 1, in <module>\n\nNameError: name 'poor' is not defined\n"
qml: Error: Function not found: 'poor.conf.get_all' (Traceback (most recent call last):

  File "<string>", line 1, in <module>

NameError: name 'poor' is not defined
)

Thra11 · 2021-03-13T15:10:18Z

Thanks for reporting! Looks like it works in nix-shell, but not when installed on the system. Think the problem is that propagatedBuildInputs works for python dependencies if you're doing python development in a shell, but they need to be added to the wrapper for an application like pure-maps. I've created a new PR which should fix the issue: #116209.

PureTryOut · 2021-03-20T16:31:36Z

@Thra11 I noticed Repology said mapbox-gl-native was of a higher version in NixOS than in Alpine Linux (where I maintain it) and I was wondering why since I was pretty sure I packaged the latest version (1.6.0). It seems NixOS packages some random commit and defines it's own version of the package?
Why do you guys do this? Why not just take 1.6.0? It works fine with Pure-maps, you just need some patches. Patch number 1 and 3 we use in Alpine are being upstreamed as well.

dotlambda · 2021-03-20T18:28:07Z

@PureTryOut Thanks for reaching out! I will change our version. Would you mind explaining what the reason for your third patch is?

dotlambda · 2021-03-20T19:02:39Z

See #117052.

PureTryOut · 2021-03-20T19:47:06Z

I don't fully know out of the top of my head, I believe I had a compilation error that was fixed with it. You'll have to ask @rinigus why it's necessary.

pkgs/development/libraries/mapbox-gl-native/default.nix

rinigus · 2021-03-21T07:27:33Z

Re patch3: it was needed for some compilers. Cannot tell which exactly, as there are few platforms that I keep updated and I don't remember which one required it.

ofborg bot added 8.has: package (new) 11.by: package-maintainer 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 labels Dec 28, 2020

Thra11 force-pushed the pure-maps branch from 4a974fd to e89e51f Compare December 28, 2020 21:21

SuperSandro2000 changed the title ~~Pure maps~~ pure-maps: init at 2.2.0 Dec 28, 2020

SuperSandro2000 reviewed Dec 28, 2020

View reviewed changes

Thra11 force-pushed the pure-maps branch 4 times, most recently from bbbeb51 to c94bbb3 Compare December 29, 2020 12:32

Thra11 mentioned this pull request Jan 3, 2021

Osmscout server #108354

Merged

10 tasks

Thra11 force-pushed the pure-maps branch 2 times, most recently from 3900117 to b62bd8d Compare January 6, 2021 18:45

SuperSandro2000 requested changes Jan 7, 2021

View reviewed changes

Thra11 force-pushed the pure-maps branch from cc97940 to ae79a68 Compare January 9, 2021 13:52

Thra11 requested a review from SuperSandro2000 January 9, 2021 15:10

Thra11 force-pushed the pure-maps branch 2 times, most recently from b4e2ecf to 4a21b49 Compare January 9, 2021 17:05

SuperSandro2000 approved these changes Jan 10, 2021

View reviewed changes

SuperSandro2000 added the 2.status: merge conflict label Feb 21, 2021

SuperSandro2000 requested changes Feb 21, 2021

View reviewed changes

Thra11 force-pushed the pure-maps branch from 4a21b49 to 833b879 Compare February 21, 2021 10:47

ofborg bot removed the 2.status: merge conflict label Feb 21, 2021

Thra11 force-pushed the pure-maps branch from 833b879 to 7f8893b Compare February 21, 2021 11:29

Thra11 requested a review from SuperSandro2000 February 21, 2021 11:31

Thra11 added 5 commits February 23, 2021 13:59

nemo-qml-plugin-dbus: init at 2.1.23

76b4a48

mapbox-gl-native: init at 2020.06.07

e9fe70c

mapbox-gl-qml: init at 1.7.5

fccc5ba

s2geometry: init at 0.9.0

e31f16e

pure-maps: init at 2.6.0

a3c72e4

Thra11 force-pushed the pure-maps branch from 68ae99a to a3c72e4 Compare February 23, 2021 14:48

Thra11 changed the title ~~pure-maps: init at 2.2.0~~ pure-maps: init at 2.6.0 Feb 23, 2021

marvin-mk2 bot added marvin needs_reviewer labels Feb 28, 2021

marvin-mk2 bot requested a review from bennyandresen February 28, 2021 13:08

marvin-mk2 bot added awaiting_reviewer and removed needs_reviewer labels Feb 28, 2021

bennyandresen approved these changes Feb 28, 2021

View reviewed changes

marvin-mk2 bot added needs_merger and removed awaiting_reviewer labels Feb 28, 2021

marvin-mk2 bot requested a review from kevincox February 28, 2021 17:13

marvin-mk2 bot added awaiting_merger and removed needs_merger labels Feb 28, 2021

SuperSandro2000 merged commit e0e4484 into NixOS:master Mar 3, 2021

SuperSandro2000 reviewed Mar 20, 2021

View reviewed changes

pkgs/development/libraries/mapbox-gl-native/default.nix Show resolved Hide resolved

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pure-maps: init at 2.6.0 #107836

pure-maps: init at 2.6.0 #107836

Thra11 commented Dec 28, 2020

SuperSandro2000 left a comment

SuperSandro2000 Dec 28, 2020

Thra11 Dec 28, 2020

SuperSandro2000 Feb 23, 2021

SuperSandro2000 commented Dec 28, 2020

SuperSandro2000 Jan 7, 2021

SuperSandro2000 commented Jan 7, 2021

SuperSandro2000 commented Jan 10, 2021

nixos-discourse commented Feb 20, 2021

SuperSandro2000 left a comment •

edited

SuperSandro2000 commented Feb 23, 2021

Thra11 commented Feb 28, 2021

marvin-mk2 bot commented Feb 28, 2021

bennyandresen left a comment

dotlambda commented Mar 13, 2021

Thra11 commented Mar 13, 2021

PureTryOut commented Mar 20, 2021

dotlambda commented Mar 20, 2021

dotlambda commented Mar 20, 2021

PureTryOut commented Mar 20, 2021

rinigus commented Mar 21, 2021

pure-maps: init at 2.6.0 #107836

pure-maps: init at 2.6.0 #107836

Conversation

Thra11 commented Dec 28, 2020

Motivation for this change

Things done

SuperSandro2000 left a comment

Choose a reason for hiding this comment

SuperSandro2000 Dec 28, 2020

Choose a reason for hiding this comment

Thra11 Dec 28, 2020

Choose a reason for hiding this comment

SuperSandro2000 Feb 23, 2021

Choose a reason for hiding this comment

SuperSandro2000 commented Dec 28, 2020

SuperSandro2000 Jan 7, 2021

Choose a reason for hiding this comment

SuperSandro2000 commented Jan 7, 2021

SuperSandro2000 commented Jan 10, 2021

nixos-discourse commented Feb 20, 2021

SuperSandro2000 left a comment • edited

Choose a reason for hiding this comment

SuperSandro2000 commented Feb 23, 2021

Thra11 commented Feb 28, 2021

marvin-mk2 bot commented Feb 28, 2021

bennyandresen left a comment

Choose a reason for hiding this comment

dotlambda commented Mar 13, 2021

Thra11 commented Mar 13, 2021

PureTryOut commented Mar 20, 2021

dotlambda commented Mar 20, 2021

dotlambda commented Mar 20, 2021

PureTryOut commented Mar 20, 2021

rinigus commented Mar 21, 2021

SuperSandro2000 left a comment •

edited