diff options
| author | Mario Rodas <marsam@users.noreply.github.com> | 2023-03-03 04:20:00 +0000 |
|---|---|---|
| committer | Mario Rodas <marsam@users.noreply.github.com> | 2023-03-03 04:20:00 +0000 |
| commit | e069b686bb5d56fecfc5be24f049bcfce81b74ca (patch) | |
| tree | 3f5dd125bb5321ce3b88404d6894211fbd1d764f | |
| parent | Merge pull request #219592 from fabaff/python-velbus-bump (diff) | |
| download | nixpkgs-e069b686bb5d56fecfc5be24f049bcfce81b74ca.tar.gz | |
h3_4: init at 4.1.0
| -rw-r--r-- | pkgs/development/misc/h3/default.nix | 62 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 44 insertions, 22 deletions
diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix index 99b7f8fdc325..279375441865 100644 --- a/pkgs/development/misc/h3/default.nix +++ b/pkgs/development/misc/h3/default.nix @@ -2,32 +2,52 @@ , stdenv , cmake , fetchFromGitHub +, static ? stdenv.hostPlatform.isStatic }: -stdenv.mkDerivation rec { - pname = "h3"; - version = "3.7.2"; +let + generic = { version, hash }: + stdenv.mkDerivation rec { + inherit version; + pname = "h3"; - src = fetchFromGitHub { - owner = "uber"; - repo = "h3"; - rev = "v${version}"; - sha256 = "sha256-MvWqQraTnab6EuDx4V0v8EvrFWHT95f2EHTL2p2kei8="; - }; + src = fetchFromGitHub { + owner = "uber"; + repo = "h3"; + rev = "v${version}"; + inherit hash; + }; + + nativeBuildInputs = [ cmake ]; - nativeBuildInputs = [ cmake ]; + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=${if static then "OFF" else "ON"}" + "-DBUILD_BENCHMARKS=OFF" + "-DBUILD_FUZZERS=OFF" + "-DBUILD_GENERATORS=OFF" + "-DENABLE_COVERAGE=OFF" + "-DENABLE_FORMAT=OFF" + "-DENABLE_LINTING=OFF" + ]; - cmakeFlags = [ - "-DBUILD_SHARED_LIBS=ON" - "-DENABLE_LINTING=OFF" - ]; + meta = with lib; { + homepage = "https://h3geo.org/"; + description = "Hexagonal hierarchical geospatial indexing system"; + license = licenses.asl20; + changelog = "https://github.com/uber/h3/raw/v${version}/CHANGELOG.md"; + platforms = platforms.all; + maintainers = [ maintainers.kalbasit ]; + }; + }; +in +{ + h3_3 = generic { + version = "3.7.2"; + hash = "sha256-MvWqQraTnab6EuDx4V0v8EvrFWHT95f2EHTL2p2kei8="; + }; - meta = with lib; { - homepage = "https://h3geo.org/"; - description = "Hexagonal hierarchical geospatial indexing system"; - license = licenses.asl20; - changelog = "https://github.com/uber/h3/raw/v${version}/CHANGELOG.md"; - platforms = platforms.all; - maintainers = [ maintainers.kalbasit ]; + h3_4 = generic { + version = "4.1.0"; + hash = "sha256-7qyN73T8XDwZLgMZld7wwShUwoLEi/2gN2oiZX8n5nQ="; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 090f5a4123cb..29d76bdab601 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16985,7 +16985,9 @@ with pkgs; ### DEVELOPMENT / MISC - h3 = callPackage ../development/misc/h3 { }; + inherit (callPackage ../development/misc/h3 { }) h3_3 h3_4; + + h3 = h3_3; amtk = callPackage ../development/libraries/amtk { }; |