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

libosmium: 2.14.2 -> 2.15.0 #52237

Merged
merged 2 commits into from Dec 16, 2018
Merged

libosmium: 2.14.2 -> 2.15.0 #52237

merged 2 commits into from Dec 16, 2018

Conversation

r-ryantm
Copy link
Contributor

Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/libosmium/versions.

meta.description for libosmium is: '"Fast and flexible C++ library for working with OpenStreetMap data"'.

Release on GitHub

Compare changes on GitHub

Checks done (click to expand)
Rebuild report (if merged into master) (click to expand)

2 total rebuild path(s)

2 package rebuild(s)

2 x86_64-linux rebuild(s)
0 i686-linux rebuild(s)
0 x86_64-darwin rebuild(s)
0 aarch64-linux rebuild(s)

First fifty rebuilds by attrpath
libosmium
osmium-tool

Instructions to test this update (click to expand)

Either download from Cachix:

nix-store -r /nix/store/z9bypxyfw8hcj9z1yhr1sh2j8qdwfnwg-libosmium-2.15.0 \
  --option binary-caches 'https://cache.nixos.org/ https://r-ryantm.cachix.org/' \
  --option trusted-public-keys '
  r-ryantm.cachix.org-1:gkUbLkouDAyvBdpBX0JOdIiD2/DP1ldF3Z3Y6Gqcc4c=
  cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
  '

(r-ryantm's Cachix cache is only trusted for this store-path realization.)

Or, build yourself:

nix-build -A libosmium https://github.com/r-ryantm/nixpkgs/archive/2bae825da1fa56d2361785132eaf1d8632e915dd.tar.gz

After you've downloaded or built it, look at the files and if there are any, run the binaries:

ls -la /nix/store/z9bypxyfw8hcj9z1yhr1sh2j8qdwfnwg-libosmium-2.15.0
ls -la /nix/store/z9bypxyfw8hcj9z1yhr1sh2j8qdwfnwg-libosmium-2.15.0/bin

cc @das-g for testing.

@r-ryantm
libosmium: 2.14.2 -> 2.15.0
2bae825 
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libosmium/versions
@das-g
Copy link
Member

das-g commented Dec 16, 2018

cc @das-g for testing.

libosmium is a header-only library, so it has no executable binaries to test.

Therefore, I tried to build osmium-tool 1.9.1 with it:

nix-build -A osmium-tool https://github.com/r-ryantm/nixpkgs/archive/2bae825da1fa56d2361785132eaf1d8632e915dd.tar.gz

This failed with

[  2%] Building CXX object src/CMakeFiles/osmium.dir/commands.cpp.o
In file included from /build/source/src/export/ruleset.hpp:4:0,
                 from /build/source/src/command_export.hpp:28,
                 from /build/source/src/commands.cpp:11:
/build/source/src/export/../util.hpp:37:11: error: using typedef-name 'using TagsFilter = class osmium::TagsFilterBase<bool>' after 'class'
     class TagsFilter;
           ^~~~~~~~~~
In file included from /build/source/src/export/options.hpp:26:0,
                 from /build/source/src/command_export.hpp:27,
                 from /build/source/src/commands.cpp:11:
/nix/store/z9bypxyfw8hcj9z1yhr1sh2j8qdwfnwg-libosmium-2.15.0/include/osmium/tags/tags_filter.hpp:157:44: note: 'using TagsFilter = class osmium::TagsFilterBase<bool>' has a previous declaration here
     using TagsFilter = TagsFilterBase<bool>;
                                            ^
make[2]: *** [src/CMakeFiles/osmium.dir/build.make:76: src/CMakeFiles/osmium.dir/commands.cpp.o] Error 1
full log 
these derivations will be built:
  /nix/store/grd76bzy44m2pjklqa5z78ms1q4h1bpj-osmium-tool-1.9.1.drv
these paths will be fetched (0.27 MiB download, 1.95 MiB unpacked):
  /nix/store/v0lrmg139dmvr8qvrhcd47649j79nbps-source
copying path '/nix/store/v0lrmg139dmvr8qvrhcd47649j79nbps-source' from 'https://cache.nixos.org'...
building '/nix/store/grd76bzy44m2pjklqa5z78ms1q4h1bpj-osmium-tool-1.9.1.drv'...
unpacking sources
unpacking source archive /nix/store/v0lrmg139dmvr8qvrhcd47649j79nbps-source
source root is source
patching sources
configuring
fixing cmake files...
cmake flags: -DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON -DCMAKE_INSTALL_INCLUDEDIR=/nix/store/aiphkmy2h847icrv9ywsa9i07qh6s9d6-osmium-tool-1.9.1/include -DCMAKE_INSTALL_LIBDIR=/nix/store/aiphkmy2h847icrv9ywsa9i07qh6s9d6-osmium-tool-1.9.1/lib -DCMAKE_INSTALL_NAME_DIR=/nix/store/aiphkmy2h847icrv9ywsa9i07qh6s9d6-osmium-tool-1.9.1/lib -DCMAKE_POLICY_DEFAULT_CMP0025=NEW -DCMAKE_OSX_DEPLOYMENT_TARGET= -DCMAKE_OSX_SYSROOT= -DCMAKE_FIND_FRAMEWORK=last -DCMAKE_STRIP=/nix/store/8rnh2n15w4wlz14wlg41b7mh8xjwjmsm-binutils-2.30/bin/strip -DCMAKE_RANLIB=/nix/store/8rnh2n15w4wlz14wlg41b7mh8xjwjmsm-binutils-2.30/bin/ranlib -DCMAKE_AR=/nix/store/8rnh2n15w4wlz14wlg41b7mh8xjwjmsm-binutils-2.30/bin/ar -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_INSTALL_PREFIX=/nix/store/aiphkmy2h847icrv9ywsa9i07qh6s9d6-osmium-tool-1.9.1
-- The C compiler identification is GNU 7.3.0
-- The CXX compiler identification is GNU 7.3.0
-- Check for working C compiler: /nix/store/x4hsbgl6bgr3wnxiipkag1sysrp7p80j-gcc-wrapper-7.3.0/bin/gcc
-- Check for working C compiler: /nix/store/x4hsbgl6bgr3wnxiipkag1sysrp7p80j-gcc-wrapper-7.3.0/bin/gcc -- works
-- Detecting C compiler ABI info
-- Detecting C compiler ABI info - done
-- Detecting C compile features
-- Detecting C compile features - done
-- Check for working CXX compiler: /nix/store/x4hsbgl6bgr3wnxiipkag1sysrp7p80j-gcc-wrapper-7.3.0/bin/g++
-- Check for working CXX compiler: /nix/store/x4hsbgl6bgr3wnxiipkag1sysrp7p80j-gcc-wrapper-7.3.0/bin/g++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Boost version: 1.67.0
-- Found the following Boost libraries:
--   program_options
-- Found ZLIB: /nix/store/ma27f3n6h01ppxbl6h1igdywhvy4cmr1-zlib-1.2.11/lib/libz.so (found version "1.2.11")
-- Looking for pthread.h
-- Looking for pthread.h - found
-- Looking for pthread_create
-- Looking for pthread_create - not found
-- Looking for pthread_create in pthreads
-- Looking for pthread_create in pthreads - not found
-- Looking for pthread_create in pthread
-- Looking for pthread_create in pthread - found
-- Found Threads: TRUE
-- Found Protozero: /nix/store/n11d3n69bpsw7za0gxwp8v0jp78aa26l-protozero-1.6.4/include (found suitable version "1.6.4", minimum required is "1.6.3")
-- Found EXPAT: /nix/store/rwafbrav49whqp3111lyg108ais3hsah-expat-2.2.6/lib/libexpat.so (found version "2.2.6")
-- Found BZip2: /nix/store/hadrbsgaycw017w0glx0679cx6g5y3q8-bzip2-1.0.6.0.1/lib/libbz2.so (found version "1.0.6")
-- Looking for BZ2_bzCompressInit
-- Looking for BZ2_bzCompressInit - found
-- Found Osmium: /nix/store/z9bypxyfw8hcj9z1yhr1sh2j8qdwfnwg-libosmium-2.15.0/include (found suitable version "2.15.0", minimum required is "2.14.2")
-- Looking for cppcheck
-- Looking for cppcheck - not found
--   Build target 'cppcheck' will not be available
-- Looking for iwyu_tool.py - not found
--   Make target 'iwyu' will not be available
-- Use C++ version: c++11
-- Build Type: Release
-- Could NOT find Git (missing: GIT_EXECUTABLE)
-- Looking for pandoc
-- Looking for pandoc - not found
--   Manual pages will not be built
-- Adding tests in add-locations-to-ways
-- Adding tests in apply-changes
-- Adding tests in cat
-- Adding tests in changeset-filter
-- Adding tests in check-refs
-- Adding tests in derive-changes
-- Adding tests in diff
-- Adding tests in export
-- Adding tests in extract
-- Adding tests in fileinfo
-- Adding tests in getid
-- Adding tests in getparents
-- Adding tests in merge
-- Adding tests in merge-changes
-- Adding tests in renumber
-- No tests for show command found
-- Adding tests in sort
-- Adding tests in tags-filter
-- Adding tests in time-filter
-- Adding tests in formats
-- Adding tests in help
-- Adding tests in misc
-- Looking for clang-tidy
-- Looking for clang-tidy - not found
--   Build target 'clang-tidy' will not be available.
-- Configuring done
-- Generating done
CMake Warning:
  Manually-specified variables were not used by the project:

    CMAKE_INSTALL_INCLUDEDIR
    CMAKE_INSTALL_LIBDIR


-- Build files have been written to: /build/source/build
cmake: enabled parallel building
building
build flags: -j1 -l1 SHELL=/nix/store/6abyjgibafsbhlc7v7lab50mb3dj81jg-bash-4.4-p23/bin/bash
Scanning dependencies of target osmium
[  1%] Building CXX object src/CMakeFiles/osmium.dir/main.cpp.o
[  2%] Building CXX object src/CMakeFiles/osmium.dir/commands.cpp.o
In file included from /build/source/src/export/ruleset.hpp:4:0,
                 from /build/source/src/command_export.hpp:28,
                 from /build/source/src/commands.cpp:11:
/build/source/src/export/../util.hpp:37:11: error: using typedef-name 'using TagsFilter = class osmium::TagsFilterBase<bool>' after 'class'
     class TagsFilter;
           ^~~~~~~~~~
In file included from /build/source/src/export/options.hpp:26:0,
                 from /build/source/src/command_export.hpp:27,
                 from /build/source/src/commands.cpp:11:
/nix/store/z9bypxyfw8hcj9z1yhr1sh2j8qdwfnwg-libosmium-2.15.0/include/osmium/tags/tags_filter.hpp:157:44: note: 'using TagsFilter = class osmium::TagsFilterBase<bool>' has a previous declaration here
     using TagsFilter = TagsFilterBase<bool>;
                                            ^
make[2]: *** [src/CMakeFiles/osmium.dir/build.make:76: src/CMakeFiles/osmium.dir/commands.cpp.o] Error 1
make[1]: *** [CMakeFiles/Makefile2:109: src/CMakeFiles/osmium.dir/all] Error 2
make: *** [Makefile:141: all] Error 2
builder for '/nix/store/grd76bzy44m2pjklqa5z78ms1q4h1bpj-osmium-tool-1.9.1.drv' failed with exit code 2
error: build of '/nix/store/grd76bzy44m2pjklqa5z78ms1q4h1bpj-osmium-tool-1.9.1.drv' failed

I'm not sure whether the culprit is osmium-tool 1.9.1 or libosmium 2.15.0, or whether despite the claim

-- Found Osmium: /nix/store/z9bypxyfw8hcj9z1yhr1sh2j8qdwfnwg-libosmium-2.15.0/include (found suitable version "2.15.0", minimum required is "2.14.2")

those versions are just not compatible to each other. (osmium-tool 1.10.0 has been released by upstream past Monday.)

@das-g
Copy link
Member

das-g commented Dec 16, 2018

(osmium-tool 1.10.0 has been released by upstream past Monday.)

Yeah, with

diff --git a/pkgs/applications/misc/osmium-tool/default.nix b/pkgs/applications/misc/osmium-tool/default.nix
index 36e58cf5070..2b35cb77038 100644
--- a/pkgs/applications/misc/osmium-tool/default.nix
+++ b/pkgs/applications/misc/osmium-tool/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "osmium-tool-${version}";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "osmcode";
     repo = "osmium-tool";
     rev = "v${version}";
-    sha256 = "1cwabjbrdpqbi2gl7448sgniiwwa73avi9l6pnvh4r0jia2wi5wk";
+    sha256 = "1balhz78nva0agmbp8n9vg8fhmdssnd9fjxj20bpw7b45mxhjc20";
   };
 
   nativeBuildInputs = [ cmake ];

osmium-tool builds fine and seems to work. (Tried osmium --version, osmium --help, osmium fileinfo --help, osmium fileinfo path/to/some.osh.pbf, osmium fileinfo --extended path/to/some.osh.pbf.)

@markuskowa
Copy link
Member

@GrahamcOfBorg build osmium-tool

@markuskowa
Copy link
Member

Thanks for checking it!

@markuskowa markuskowa merged commit 6166854 into NixOS:master Dec 16, 2018
@das-g das-g mentioned this pull request Dec 16, 2018
Closed
@r-ryantm r-ryantm deleted the auto-update/libosmium branch December 24, 2018 04:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@das-g das-g das-g approved these changes

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
4 participants
@r-ryantm @das-g @markuskowa @GrahamcOfBorg