Commit f5d4132e authored by Venkat-Sundaraneedi's avatar Venkat-Sundaraneedi
Browse files

solana-cli: 2.3.13 -> 3.0.12 

Update solana-cli from 2.3.13 to 3.0.12, which includes:
     - Version bump and updated hashes
     - Added new `agave-watchtower` binary
     - Renamed `solana-log-analyzer` to `solana-dos`
     - Fixed RUSTFLAGS to allow unused parentheses warnings
     - Updated repository URLs in comments
parent fb061408

pkgs/by-name/so/solana-cli/package.nix

+96 −94
Original line number Diff line number Diff line
@@ -13,8 +13,9 @@ 
  clang,

  libclang,

  rocksdb,

  # Taken from https://github.com/solana-labs/solana/blob/master/scripts/cargo-install-all.sh#L84

  solanaPkgs ? [

  # Taken from https://github.com/anza-xyz/agave/blob/master/scripts/cargo-install-all.sh#L84

  solanaPkgs ?

    [

      "cargo-build-sbf"

      "cargo-test-sbf"

      "solana"
@@ -24,20 +25,20 @@ 
      "agave-install"

      "solana-keygen"

      "agave-ledger-tool"

    "solana-log-analyzer"

      "solana-dos"

      "solana-net-shaper"

      "agave-validator"

      "solana-test-validator"

      "agave-watchtower"

    ]

    ++ [

      # XXX: Ensure `solana-genesis` is built LAST!

      # See https://github.com/solana-labs/solana/issues/5826

      "solana-genesis"

    ],

}:

let

  version = "2.3.13";

  hash = "sha256-RSucqvbshaaby4fALhAQJtZztwsRdA+X7yRnoBxQvsg=";

}: let

  version = "3.0.12";

  hash = "sha256-Zubu7cTSJrJFSuguCo3msdas/QshFpo1+T6DVQyqrhY=";

in

  rustPlatform.buildRustPackage rec {

    pname = "solana-cli";
@@ -50,11 +51,11 @@ rustPlatform.buildRustPackage rec { 
      inherit hash;

    };



  cargoHash = "sha256-yTS++bUu+4wmbXXZkU4eDq4sGNzls1euptJoY6OYZOM=";

    cargoHash = "sha256-qnZbFkyzE2hdy/ynZQZmCs5kCeTUMci9f/pVKID/mRQ=";



    strictDeps = true;

    cargoBuildFlags = map (n: "--bin=${n}") solanaPkgs;

  RUSTFLAGS = "-Amismatched_lifetime_syntaxes -Adead_code";

    RUSTFLAGS = "-Amismatched_lifetime_syntaxes -Adead_code -Aunused_parens";

    LIBCLANG_PATH = "${libclang.lib}/lib";



    # Even tho the tests work, a shit ton of them try to connect to a local RPC
@@ -69,7 +70,8 @@ rustPlatform.buildRustPackage rec { 
      protobuf

      pkg-config

    ];

  buildInputs = [

    buildInputs =

      [

        openssl

        clang

        libclang
@@ -108,17 +110,17 @@ rustPlatform.buildRustPackage rec { 
    # If set, always finds OpenSSL in the system, even if the vendored feature is enabled.

    OPENSSL_NO_VENDOR = 1;



  meta = {

    meta = with lib; {

      description = "Web-Scale Blockchain for fast, secure, scalable, decentralized apps and marketplaces";

      homepage = "https://solana.com";

    license = lib.licenses.asl20;

    maintainers = with lib.maintainers; [

      license = licenses.asl20;

      maintainers = with maintainers; [

        netfox

        happysalada

        aikooo7

        JacoMalan1

      ];

    platforms = lib.platforms.unix;

      platforms = platforms.unix;

    };



    passthru.updateScript = nix-update-script {};