open-orienteering-mapper: init at 0.8.1 #37326

mpickering · 2018-03-18T15:21:17Z

Motivation for this change

Two new packages. I have only tested these on darwin.

This also depends on #35667 as otherwise some dependencies don't build.

I put this in the gis folder as it is related to qgis at least somewhat and if this doesn't get added there then nothing else ever will.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-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 nox --run "nox-review wip"
Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

jtojnar · 2018-03-18T15:25:53Z

pkgs/applications/gis/open-orienteering-mapper/default.nix

+
+  buildInputs = [ gdal qtbase qttools qtlocation qtsensors clipper zlib proj doxygen cups];
+
+  nativeBuildInputs = [ cmake makeWrapper ];


Could you also add ninja?

jtojnar · 2018-03-18T15:26:11Z

pkgs/applications/gis/open-orienteering-mapper/default.nix

+
+  nativeBuildInputs = [ cmake makeWrapper ];
+
+  enableParallelBuilding = true;


CMake builds in parallel by default.

jtojnar · 2018-03-18T15:26:52Z

pkgs/development/libraries/clipper/default.nix

+
+  buildInputs = [ ];
+
+  nativeBuildInputs = [ cmake unzip ];


jtojnar · 2018-03-18T15:28:26Z

pkgs/applications/gis/open-orienteering-mapper/default.nix

+      OpenOrienteering Mapper is an orienteering mapmaking program
+      and provides a free alternative to the existing proprietary solution.
+    '';
+    homepage = http://www.openorienteering.org/apps/mapper/;


jtojnar · 2018-03-18T15:28:49Z

pkgs/applications/gis/open-orienteering-mapper/default.nix

+    sha256 = "1mqnmsb765970p9xfss6sf3ym0kmg8069qjlh5h5pjm3646bzphl";
+  };
+
+  cmakeFlags =


Why not just use a single list?

jtojnar · 2018-03-18T15:29:46Z

pkgs/applications/gis/open-orienteering-mapper/default.nix

+  patches = [ ./license.patch ];
+
+  src = fetchurl {
+    url = "https://github.com/OpenOrienteering/mapper/archive/v${version}.tar.gz";


You should use fetchFromGitHub if you just want to download a tag.

jtojnar · 2018-03-18T15:44:57Z

pkgs/applications/gis/open-orienteering-mapper/default.nix

+  enableParallelBuilding = true;
+
+  # Don't build the manual or bundle licenses
+  patches = [ ./license.patch ];


You can use -DLICENSING_PROVIDER:BOOL=OFF OpenOrienteering/mapper#886 (comment)

jtojnar · 2018-03-18T15:46:06Z

pkgs/applications/gis/open-orienteering-mapper/default.nix

+    ["-DPROJ4_ROOT=${proj}"] ++
+    # FindGDAL is broken and always finds /Library/Framework unless this is
+    # specified
+    ["-DGDAL_INCLUDE_DIR=${gdal}/include"] ++


Could you make the darwin specific flags conditional?

jtojnar · 2018-03-18T15:47:54Z

pkgs/top-level/all-packages.nix

@@ -16915,6 +16917,8 @@ with pkgs;

  openjump = callPackage ../applications/misc/openjump { };

+  open-orienteering-mapper = libsForQt5.callPackage ../applications/gis/open-orienteering-mapper { };


The application is named OpenOrienteering Mapper so it should probably be named openorienteering-mapper as other distros do: https://repology.org/metapackage/openorienteering-mapper/versions

mpickering · 2018-03-18T17:13:28Z

I made all of @jtojnar's suggested changes, thanks for the review. The patch turned out to not be necessary.

jtojnar · 2018-03-18T17:56:28Z

pkgs/development/libraries/clipper/default.nix

+  version = "6.4.2";
+  name = "Clipper-${version}";
+  src = fetchurl {
+    url = "https://download.sourceforge.net/project/polyclipping/clipper_ver${version}.zip";


You can use sourceforge mirror: protocol.

What do you mean exactly? Replace https with mirror?

Something like mirror://sourceforge/polyclipping/clipper_ver${version}.zip

mpickering · 2018-03-18T19:30:57Z

I change the clipper url.

lheckemann · 2018-03-23T09:58:33Z

@GrahamcOfBorg build openorienteering-mapper

GrahamcOfBorg · 2018-03-23T09:58:58Z

No attempt on x86_64-linux (full log)

The following builds were skipped because they don't evaluate on x86_64-linux: openorienteering-mapper

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-03-23T09:59:09Z

No attempt on aarch64-linux (full log)

The following builds were skipped because they don't evaluate on aarch64-linux: openorienteering-mapper

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowBroken = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowBroken = true; }
to ~/.config/nixpkgs/config.nix.

GrahamcOfBorg · 2018-03-23T10:14:10Z

Success on x86_64-darwin (full log)

Attempted: openorienteering-mapper

Partial log (click to expand)

--
-- fixup_bundle: done
-- Installing: /nix/store/7saa602795g6qxs8a57nblx6snbqyf11-OpenOrienteering-Mapper-0.8.1/Mapper.app/Contents/Resources/doc/3rd-party/qtsingleapplication.txt
-- Installing: /nix/store/7saa602795g6qxs8a57nblx6snbqyf11-OpenOrienteering-Mapper-0.8.1/Mapper.app/Contents/Resources/doc/common-licenses/GPL-3.txt
-- Installing: /nix/store/7saa602795g6qxs8a57nblx6snbqyf11-OpenOrienteering-Mapper-0.8.1/Mapper.app/Contents/Resources/doc/licensing.html
post-installation fixup
strip is /nix/store/vb6mgjqgd9h11nbv60fvrp1ls9nxck2y-cctools-binutils-darwin/bin/strip
stripping (with command strip and flags -S) in /nix/store/7saa602795g6qxs8a57nblx6snbqyf11-OpenOrienteering-Mapper-0.8.1/bin
patching script interpreter paths in /nix/store/7saa602795g6qxs8a57nblx6snbqyf11-OpenOrienteering-Mapper-0.8.1
postPatchMkspecs

thoughtpolice · 2018-03-24T19:38:54Z

LGTM, and Borg gave it the clear -- @jtojnar, if there's something else missed/you want changed, feel free to pin that on me and I'll fix it in a follow up.

sikmir · 2019-06-18T20:12:05Z

pkgs/applications/gis/openorienteering-mapper/default.nix

+}:
+
+stdenv.mkDerivation rec {
+  name = "OpenOrienteering-Mapper-${version}";


@mpickering

13.2. Package naming:

The name attribute must not contain uppercase letters — e.g., "mplayer-1.0rc2" instead of "MPlayer-1.0rc2".

The rules are still evolving and I feel like this one is being phased out these days.

GrahamcOfBorg added 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Mar 18, 2018

jtojnar requested changes Mar 18, 2018

View reviewed changes

mpickering force-pushed the oom-darwin branch from 19efbab to fc05900 Compare March 18, 2018 16:52

jtojnar reviewed Mar 18, 2018

View reviewed changes

mpickering added 2 commits March 18, 2018 18:36

clipper: init at 6.4.2

71d2ab0

open-orienteering-mapper: init at 0.8.1

5632cb9

mpickering force-pushed the oom-darwin branch from fc05900 to 5632cb9 Compare March 18, 2018 18:36

thoughtpolice merged commit 1e0a60b into NixOS:master Mar 24, 2018

sikmir reviewed Jun 18, 2019

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

open-orienteering-mapper: init at 0.8.1 #37326

open-orienteering-mapper: init at 0.8.1 #37326

mpickering commented Mar 18, 2018 •

edited

jtojnar Mar 18, 2018

jtojnar Mar 18, 2018

jtojnar Mar 18, 2018

jtojnar Mar 18, 2018

jtojnar Mar 18, 2018

jtojnar Mar 18, 2018

jtojnar Mar 18, 2018

jtojnar Mar 18, 2018

jtojnar Mar 18, 2018

mpickering commented Mar 18, 2018

jtojnar Mar 18, 2018

mpickering Mar 18, 2018

jtojnar Mar 18, 2018

mpickering commented Mar 18, 2018

lheckemann commented Mar 23, 2018

GrahamcOfBorg commented Mar 23, 2018

GrahamcOfBorg commented Mar 23, 2018

GrahamcOfBorg commented Mar 23, 2018

thoughtpolice commented Mar 24, 2018

sikmir Jun 18, 2019

jtojnar Jun 18, 2019


		buildInputs = [ gdal qtbase qttools qtlocation qtsensors clipper zlib proj doxygen cups];

		nativeBuildInputs = [ cmake makeWrapper ];


		nativeBuildInputs = [ cmake makeWrapper ];

		enableParallelBuilding = true;

		@@ -16915,6 +16917,8 @@ with pkgs;

		openjump = callPackage ../applications/misc/openjump { };

		open-orienteering-mapper = libsForQt5.callPackage ../applications/gis/open-orienteering-mapper { };

open-orienteering-mapper: init at 0.8.1 #37326

open-orienteering-mapper: init at 0.8.1 #37326

Conversation

mpickering commented Mar 18, 2018 • edited

Motivation for this change

Things done

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mpickering commented Mar 18, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mpickering commented Mar 18, 2018

lheckemann commented Mar 23, 2018

GrahamcOfBorg commented Mar 23, 2018

GrahamcOfBorg commented Mar 23, 2018

GrahamcOfBorg commented Mar 23, 2018

thoughtpolice commented Mar 24, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mpickering commented Mar 18, 2018 •

edited