Skip to content

Commit

Permalink
chore: clean up comments
Browse files Browse the repository at this point in the history
  • Loading branch information
jadepark-dev committed Sep 2, 2024
1 parent 0b17739 commit 95aeb06
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 10 deletions.
6 changes: 1 addition & 5 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,20 @@
flake-utils.lib.eachDefaultSystem (system:
let
pkgs = import nixpkgs { inherit system; overlays = [ rust-overlay.overlays.default ]; };
# import solana packages
solanaPkgs = pkgs.callPackage ./solana.nix {};
in {
formatter = pkgs.nixpkgs-fmt;

devShells = {
default = pkgs.callPackage ./shell.nix {
inherit pkgs;
scriptDir = toString ./.; # converts the flakes'root dir to string
scriptDir = toString ./.;
};
# interactive shell with Solana CLI tool accessibility
solana-cli = solanaPkgs.solana-cli-shell;
};

packages = {
# dockerized Solana test validator
solana-test-validator = solanaPkgs.solana-test-validator;
# environment package for Solana CLI
solana-cli-env = solanaPkgs.solana-cli-env;
};
});
Expand Down
10 changes: 5 additions & 5 deletions solana.nix
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
pkgs ? import <nixpkgs> { inherit system; },
}:

# It provides two derivations, one for x86_64-linux and another for aarch64-apple-darwin.
# Each derivation downloads the corresponding Solana release.
# Solana integration
let
version = "v1.18.22";
getBinDerivation =
Expand All @@ -27,6 +26,8 @@ let
'';
};

# It provides two derivations, one for x86_64-linux and another for aarch64-apple-darwin.
# Each derivation downloads the corresponding Solana release.
solanaBinaries = {
x86_64-linux = getBinDerivation {
name = "solana-cli-x86_64-linux";
Expand All @@ -52,7 +53,7 @@ in
];
};

# Provides interactive shell with Solana CLI tool accessibility.
# Provides interactive dev shell with Solana CLI tool accessibility.
solana-cli-shell = pkgs.mkShell {
buildInputs = pkgs.lib.optionals pkgs.stdenv.isLinux [
solanaBinaries.x86_64-linux
Expand All @@ -73,8 +74,7 @@ in
'';
};

# Provides dockerized Solana test validator accessibility.
# https://hub.docker.com/r/solanalabs/solana/
# Provides dockerized Solana test validator accessibility. https://hub.docker.com/r/solanalabs/solana
# Currently the official docker image only supports x86_64-linux.(https://github.com/anza-xyz/agave/tree/master/sdk/docker-solana)
solana-test-validator = pkgs.stdenv.mkDerivation rec {
name = "solana-test-validator";
Expand Down

0 comments on commit 95aeb06

Please sign in to comment.