libroxml: init at 2.3.0 and osm2xmap: init at 2.0 c1f7b68 #30068

mpickering · 2017-10-03T22:07:41Z

Motivation for this change

A package which I packaged for my own personal use which wasn't already included.

Things done

Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
Built on platform(s)
- [X ] NixOS
- macOS
- Linux
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"
[X ] Tested execution of all binary files (usually in ./result/bin/)
Fits CONTRIBUTING.md.

vyp · 2017-10-03T22:45:57Z

pkgs/applications/misc/osm2xmap/default.nix

+
+  name = "osm2xmap-2.0";
+
+  src = fetchurl {


Why not use fetchFromGitHub?

vyp · 2017-10-03T22:48:40Z

pkgs/applications/misc/osm2xmap/default.nix

+    '';
+
+  preBuild = ''
+    '';


I might be wrong but I don't think this overrides it, you might need to pass : to do that, see #29583.

vyp · 2017-10-03T22:49:22Z

pkgs/applications/misc/osm2xmap/default.nix

+    homepage = "https://github.com/sembruk/osm2xmap";
+    description = "Converter from OpenStreetMap data format to OpenOrienteering Mapper format.";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ ];


A maintainer must be set.

vyp · 2017-10-03T22:53:01Z

pkgs/applications/misc/osm2xmap/default.nix

+  buildInputs = [ libroxml proj libyamlcpp boost ];
+
+
+  meta = {


For libroxml you have meta = with stdenv.lib;, so you can also do that here for consistency if you like.

vyp · 2017-10-03T22:57:23Z

pkgs/development/libraries/libroxml/default.nix

+stdenv.mkDerivation {
+  name = "libroxml-2.3.0";
+  src = fetchurl {
+    url = "http://download.libroxml.net/pool/v2.x/libroxml-2.3.0.tar.gz";


For the last part of the URL you can just do ${name}.tar.gz if you'd like (for example to have slightly less things to change if you ever update it). You will need to do stdenv.mkDerivation rec { for that though.

vyp · 2017-10-03T22:58:03Z

pkgs/development/libraries/libroxml/default.nix

+    description = "This library is minimum, easy-to-use, C implementation for xml file parsing.";
+    license = licenses.lgpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ];


Again, maintainers must be set.

mpickering · 2017-10-17T18:47:50Z

Thanks @vyp I updated the patch taking into account most of your comments. I couldn't get the thing with ${name} to work.

Mic92 · 2017-10-17T20:37:37Z

pkgs/applications/misc/osm2xmap/default.nix

+    "SHAREDIR=$(out)/share"
+    "INSTALL_BINDIR=$(out)/bin"
+    "INSTALL_BINDIR=$(out)/share/man/man1"
+    "INSTALL_SHAREDIR=$(out)/share"


I cleaned things up a bit here.

This broke the build. osm2xmap is not available anymore after these changes.

Typo: I wrote INSTALL_BINDIR=$(out)/share/man/man1 instead of INSTALL_MANDIR=$(out)/share/man/man1

Mic92 · 2017-10-17T20:38:50Z

pkgs/top-level/all-packages.nix

+        url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz";
+        sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db";
+      };
+    });


I would rather add a dedicated libyamlcpp_0_3 instead so everybody can use it.

mpickering · 2017-10-17T22:30:04Z

Thanks for your help trying to clean things up @Mic92 but it broke the derivation.

vyp · 2017-10-17T23:47:34Z

@mpickering So all I just meant was stdenv.mkDerivation rec { for line 3, and url = "http://download.libroxml.net/pool/v2.x/${name}.tar.gz"; for line 6 for libroxml. But no worries it's no big deal to keep it as is either. 👍

mpickering · 2017-10-18T10:47:55Z

It is still broken.. Can you please revert your changes so this can be merged?

Mic92 · 2017-10-18T10:55:15Z

@mpickering are you sure? The build output is identical.

Mic92 · 2017-10-18T11:35:51Z

pkgs/applications/misc/osm2xmap/default.nix

+  makeFlags = [
+    "GIT_VERSION=$(version)"
+    "GIT_TIMESTAMP="
+    "SHAREDIR=$(out)/share"


This must be:

diff --git a/pkgs/applications/misc/osm2xmap/default.nix b/pkgs/applications/misc/osm2xmap/default.nix index b827cca6e4c..b5b8e68e077 100644 --- a/pkgs/applications/misc/osm2xmap/default.nix +++ b/pkgs/applications/misc/osm2xmap/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeFlags = [ "GIT_VERSION=$(version)" "GIT_TIMESTAMP=" - "SHAREDIR=$(out)/share" + "SHAREDIR=$(out)/share/" "INSTALL_BINDIR=$(out)/bin" "INSTALL_MANDIR=$(out)/share/man/man1" "INSTALL_SHAREDIR=$(out)/share"

Mic92 · 2017-10-18T11:48:29Z

Now only adding libyamlcpp_0_3 is left. And please squash the fixups into osm2xmap: init at 2.0 afterwards.

mpickering · 2017-10-18T20:46:42Z

I made a libyamlcpp_0_3 attribute and squashed your improvements into my patch.

Mic92 · 2017-10-18T21:14:45Z

pkgs/top-level/all-packages.nix

+      url = "https://github.com/jbeder/yaml-cpp/archive/release-0.3.0.tar.gz";
+      sha256 = "12aszqw6svwlnb6nzhsbqhz3c7vnd5ahd0k6xlj05w8lm83hx3db";
+      };
+    });


indentation

Mic92 · 2017-10-18T21:15:05Z

pkgs/top-level/all-packages.nix

+
+  osm2xmap = callPackage ../applications/misc/osm2xmap {
+    libyamlcpp = libyamlcpp_0_3;
+


Please remove this empty line.

Mic92 · 2017-10-18T21:15:42Z

pkgs/applications/misc/osm2xmap/default.nix

+
+}
+
+


Please remove these empty lines

mpickering · 2017-12-09T12:38:20Z

Removed the whitespace lines now.

grahamc · 2018-02-03T18:41:32Z

@GrahamcOfBorg build osm2xmap lxbroxml

GrahamcOfBorg · 2018-02-03T18:41:42Z

Failure on x86_64-linux (full log)

Partial log (click to expand)

error: attribute ‘lxbroxml’ in selection path ‘lxbroxml’ not found

GrahamcOfBorg · 2018-02-03T18:41:53Z

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘osm2xmap-2.0’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/applications/misc/osm2xmap/default.nix:29 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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-02-03T18:42:45Z

Failure on aarch64-linux (full log)

Partial log (click to expand)

error: attribute 'lxbroxml' in selection path 'lxbroxml' not found

grahamc · 2018-02-03T18:43:28Z

... d'oh.

@GrahamcOfBorg build osm2xmap libroxml

GrahamcOfBorg · 2018-02-03T18:43:34Z

Failure on x86_64-darwin (full log)

Partial log (click to expand)

Package ‘osm2xmap-2.0’ in /Users/graham/nix-borg/repo/38dca4e3aa6bca43ea96d2fcc04e8229/builder/grahamc-ndnd/pkgs/applications/misc/osm2xmap/default.nix:29 is not supported on ‘x86_64-darwin’, refusing to evaluate.

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-02-03T18:44:20Z

Success on x86_64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/znzp6rsxfwb0irhjj9byz73npw189zq7-osm2xmap-2.0
shrinking /nix/store/znzp6rsxfwb0irhjj9byz73npw189zq7-osm2xmap-2.0/bin/osm2xmap
gzipping man pages under /nix/store/znzp6rsxfwb0irhjj9byz73npw189zq7-osm2xmap-2.0/share/man/
strip is /nix/store/5qj61lcvzlap87rf6blvf8p577d482bv-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/znzp6rsxfwb0irhjj9byz73npw189zq7-osm2xmap-2.0/bin 
patching script interpreter paths in /nix/store/znzp6rsxfwb0irhjj9byz73npw189zq7-osm2xmap-2.0
checking for references to /tmp/nix-build-osm2xmap-2.0.drv-0 in /nix/store/znzp6rsxfwb0irhjj9byz73npw189zq7-osm2xmap-2.0...
/nix/store/znzp6rsxfwb0irhjj9byz73npw189zq7-osm2xmap-2.0
/nix/store/plp5zf1alfh018mvqfzyh8n8dxbkb171-libroxml-2.3.0

GrahamcOfBorg · 2018-02-03T18:56:48Z

Success on aarch64-linux (full log)

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/ykkn6dvnm1mz88air1alc7nn25jf3q7q-osm2xmap-2.0
shrinking /nix/store/ykkn6dvnm1mz88air1alc7nn25jf3q7q-osm2xmap-2.0/bin/osm2xmap
gzipping man pages under /nix/store/ykkn6dvnm1mz88air1alc7nn25jf3q7q-osm2xmap-2.0/share/man/
strip is /nix/store/xmpjypwjmp2qi1chs5kr0hacnh161ls4-binutils-2.28.1/bin/strip
stripping (with command strip and flags -S) in /nix/store/ykkn6dvnm1mz88air1alc7nn25jf3q7q-osm2xmap-2.0/bin
patching script interpreter paths in /nix/store/ykkn6dvnm1mz88air1alc7nn25jf3q7q-osm2xmap-2.0
checking for references to /build in /nix/store/ykkn6dvnm1mz88air1alc7nn25jf3q7q-osm2xmap-2.0...
/nix/store/ykkn6dvnm1mz88air1alc7nn25jf3q7q-osm2xmap-2.0
/nix/store/5j6yzrsa88rnj428rk0pd47vv5aa8pfl-libroxml-2.3.0

vyp reviewed Oct 3, 2017

View reviewed changes

mpickering force-pushed the osm2xmap branch from c1f7b68 to 1677f91 Compare October 17, 2017 18:45

mpickering requested a review from edolstra as a code owner October 17, 2017 18:45

Mic92 reviewed Oct 17, 2017

View reviewed changes

Mic92 force-pushed the osm2xmap branch from b9baefd to acd6a05 Compare October 18, 2017 10:29

Mic92 reviewed Oct 18, 2017

View reviewed changes

mpickering force-pushed the osm2xmap branch from a2ea45f to bf95e96 Compare October 18, 2017 20:44

Mic92 reviewed Oct 18, 2017

View reviewed changes

pkgs/applications/misc/osm2xmap/default.nix Outdated

}

Copy link

Member

Mic92 Oct 18, 2017 •

edited

Choose a reason for hiding this comment

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

Please remove these empty lines

mpickering force-pushed the osm2xmap branch from bf95e96 to a84c49a Compare December 9, 2017 12:38

GrahamcOfBorg added 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Dec 9, 2017

mpickering added 4 commits February 3, 2018 18:35

Add mpickering to maintainers list

5dbaf18

libroxml: init at 2.3.0

8b36295

osm2xmap: init at 2.0

9c7c640

Remove whitespace

c8763dd

mpickering force-pushed the osm2xmap branch from a84c49a to c8763dd Compare February 3, 2018 18:39

grahamc merged commit 92b786a into NixOS:master Feb 3, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

libroxml: init at 2.3.0 and osm2xmap: init at 2.0 c1f7b68 #30068

libroxml: init at 2.3.0 and osm2xmap: init at 2.0 c1f7b68 #30068

mpickering commented Oct 3, 2017

vyp Oct 3, 2017

vyp Oct 3, 2017

vyp Oct 3, 2017

vyp Oct 3, 2017

vyp Oct 3, 2017

vyp Oct 3, 2017

mpickering commented Oct 17, 2017

Mic92 Oct 17, 2017

mpickering Oct 17, 2017

Mic92 Oct 18, 2017

Mic92 Oct 17, 2017

mpickering commented Oct 17, 2017

vyp commented Oct 17, 2017

mpickering commented Oct 18, 2017

Mic92 commented Oct 18, 2017

Mic92 Oct 18, 2017 •

edited

Mic92 commented Oct 18, 2017 •

edited

mpickering commented Oct 18, 2017

Mic92 Oct 18, 2017

Mic92 Oct 18, 2017 •

edited

Mic92 Oct 18, 2017 •

edited

mpickering commented Dec 9, 2017

grahamc commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

grahamc commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018


		osm2xmap = callPackage ../applications/misc/osm2xmap {
		libyamlcpp = libyamlcpp_0_3;

libroxml: init at 2.3.0 and osm2xmap: init at 2.0 c1f7b68 #30068

libroxml: init at 2.3.0 and osm2xmap: init at 2.0 c1f7b68 #30068

Conversation

mpickering commented Oct 3, 2017

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

mpickering commented Oct 17, 2017

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 Oct 17, 2017

vyp commented Oct 17, 2017

mpickering commented Oct 18, 2017

Mic92 commented Oct 18, 2017

Mic92 Oct 18, 2017 • edited

Choose a reason for hiding this comment

Mic92 commented Oct 18, 2017 • edited

mpickering commented Oct 18, 2017

Choose a reason for hiding this comment

Mic92 Oct 18, 2017 • edited

Choose a reason for hiding this comment

Mic92 Oct 18, 2017 • edited

Choose a reason for hiding this comment

mpickering commented Dec 9, 2017

grahamc commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

grahamc commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

GrahamcOfBorg commented Feb 3, 2018

Mic92 Oct 18, 2017 •

edited

Mic92 commented Oct 18, 2017 •

edited

Mic92 Oct 18, 2017 •

edited

Mic92 Oct 18, 2017 •

edited