Unverified Commit 04b40d66 authored by Mario Rodas's avatar Mario Rodas Committed by GitHub
Browse files

Merge pull request #219620 from marsam/update-h3 

h3_4: init at 4.1.0
parents 06c40b74 908a8f3e

pkgs/development/misc/h3/default.nix

+41 −21
Original line number Diff line number Diff line
@@ -2,23 +2,31 @@ 
, stdenv

, cmake

, fetchFromGitHub

, static ? stdenv.hostPlatform.isStatic

}:



let

  generic = { version, hash }:

    stdenv.mkDerivation rec {

      inherit version;

      pname = "h3";

  version = "3.7.2";



      src = fetchFromGitHub {

        owner = "uber";

        repo = "h3";

        rev = "v${version}";

    sha256 = "sha256-MvWqQraTnab6EuDx4V0v8EvrFWHT95f2EHTL2p2kei8=";

        inherit hash;

      };



      nativeBuildInputs = [ cmake ];



      cmakeFlags = [

    "-DBUILD_SHARED_LIBS=ON"

        "-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"

      ];
@@ -28,6 +36,18 @@ stdenv.mkDerivation rec { 
        license = licenses.asl20;

        changelog = "https://github.com/uber/h3/raw/v${version}/CHANGELOG.md";

        platforms = platforms.all;

    maintainers = [ maintainers.kalbasit ];

        maintainers = with maintainers; [ kalbasit marsam ];

      };

    };

in

{

  h3_3 = generic {

    version = "3.7.2";

    hash = "sha256-MvWqQraTnab6EuDx4V0v8EvrFWHT95f2EHTL2p2kei8=";

  };



  h3_4 = generic {

    version = "4.1.0";

    hash = "sha256-7qyN73T8XDwZLgMZld7wwShUwoLEi/2gN2oiZX8n5nQ=";

  };

}

pkgs/top-level/all-packages.nix

+3 −1
Original line number Diff line number Diff line
@@ -17081,7 +17081,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 { };