Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: b2f6aa631edc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 65492f754016
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 14, 2020

  1. osmctools: 0.8.5plus1.4.0 -> 0.9

    @sikmir
    sikmir committed Jan 14, 2020

    Verified

    This commit was signed with the committer’s verified signature.
    sikmir Nikolay Korotkiy
    GPG key ID: D1DE6D7F693663A5
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f03b833 View commit details

  2. osmctools: 0.8.5plus1.4.0 -> 0.9 (#76573) 

    osmctools: 0.8.5plus1.4.0 -> 0.9
    @Mic92
    Mic92 authored Jan 14, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    65492f7 View commit details
Showing with 14 additions and 33 deletions.
  1. +14 −33 pkgs/applications/misc/osmctools/default.nix
47 changes: 14 additions & 33 deletions pkgs/applications/misc/osmctools/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,46 +1,27 @@
{ stdenv, fetchurl, zlib } :
{ stdenv, fetchFromGitLab, autoreconfHook, zlib }:

let

convert_src = fetchurl {
url = http://m.m.i24.cc/osmconvert.c;
sha256 = "1mvmb171c1jqxrm80jc7qicwk4kgg7yq694n7ci65g6i284r984x";
# version = 0.8.5
};
stdenv.mkDerivation rec {
pname = "osmctools";
version = "0.9";

filter_src = fetchurl {
url = http://m.m.i24.cc/osmfilter.c;
sha256 = "0vm3bls9jb2cb5b11dn82sxnc22qzkf4ghmnkivycigrwa74i6xl";
# version = 1.4.0
src = fetchFromGitLab {
owner = "osm-c-tools";
repo = pname;
rev = version;
sha256 = "1m8d3r1q1v05pkr8k9czrmb4xjszw6hvgsf3kn9pf0v14gpn4r8f";
};

in

stdenv.mkDerivation {
pname = "osmctools";
version = "0.8.5plus1.4.0";

nativeBuildInputs = [ autoreconfHook ];
buildInputs = [ zlib ];

phases = [ "buildPhase" "installPhase" ];

buildPhase = ''
cc ${convert_src} -lz -O3 -o osmconvert
cc ${filter_src} -O3 -o osmfilter
'';

installPhase = ''
mkdir -p $out/bin
mv osmconvert $out/bin
mv osmfilter $out/bin
'';

meta = with stdenv.lib; {
description = "Command line tools for transforming Open Street Map files";
homepage = [
https://wiki.openstreetmap.org/wiki/Osmconvert
https://wiki.openstreetmap.org/wiki/Osmfilter
https://wiki.openstreetmap.org/wiki/osmconvert
https://wiki.openstreetmap.org/wiki/osmfilter
https://wiki.openstreetmap.org/wiki/osmupdate
];
maintainers = with maintainers; [ sikmir ];
platforms = platforms.unix;
license = licenses.agpl3;
};