Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update tagged base64 #136

Merged
merged 2 commits into from
Nov 14, 2023
Merged

Update tagged base64 #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d67cb1d
Clean up Nix flake and make it build on OSX
jbearer Nov 14, 2023
31b29ab
Update tagged-base64
jbearer Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 36 additions & 24 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "tide-disco"
version = "0.4.1"
version = "0.4.3"
edition = "2021"
authors = ["Espresso Systems <[email protected]>"]
description = "Discoverability for Tide"
Expand Down Expand Up @@ -40,7 +40,7 @@ snafu = { version = "0.7", features = ["backtraces"] }
strum = "0.25"
strum_macros = "0.25"
surf = "2.3.2"
tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64.git", tag = "0.2.4" }
tagged-base64 = { git = "https://github.com/EspressoSystems/tagged-base64.git", tag = "0.3.4" }
tide = { version = "0.16.0", default-features = false }
tide-websockets = "0.4.0"
toml = "0.8"
Expand All @@ -55,7 +55,7 @@ url = "2.2.2"
signal-hook-async-std = "0.2.2"

[dev-dependencies]
ark-serialize = { version = "0.3.0", features = ["derive"] }
ark-serialize = { version = "0.4", features = ["derive"] }
ark-std = "0.4.0"
async-tungstenite = { version = "0.23", features = ["async-std-runtime"] }
portpicker = "0.1"
Expand Down
27 changes: 13 additions & 14 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@
{
description = "Development shell for Tide Disco";

nixConfig = {
extra-substituters = [
"https://espresso-systems-private.cachix.org"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This really shouldn't be in a public repository...

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed offline it is safe to put these in a public repo, but not ideal because people outside the organization can't use the cache, and their builds are much slower. Made an issue to improve this later

"https://nixpkgs-cross-overlay.cachix.org"
];
extra-trusted-public-keys = [
"espresso-systems-private.cachix.org-1:LHYk03zKQCeZ4dvg3NctyCq88e44oBZVug5LpYKjPRI="
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likewise.

"nixpkgs-cross-overlay.cachix.org-1:TjKExGN4ys960TlsGqNOI/NBdoz2Jdr2ow1VybWV5JM="
];
};

inputs.nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";

inputs.flake-utils.url = "github:numtide/flake-utils";
Expand All @@ -25,7 +36,7 @@
inputs.fenix.url = "github:nix-community/fenix";
inputs.fenix.inputs.nixpkgs.follows = "nixpkgs";

outputs = { self, nixpkgs, flake-utils, flake-compat, rust-overlay, fenix, ... }:
outputs = { self, nixpkgs, flake-utils, rust-overlay, fenix, ... }:
flake-utils.lib.eachDefaultSystem (system:
let
info = builtins.split "\([a-zA-Z0-9_]+\)" system;
Expand All @@ -40,46 +51,34 @@
[
pkg-config
openssl
bash

curl

cargo-edit
cargo-udeps
cargo-sort
cmake
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
darwin.apple_sdk.frameworks.CoreFoundation
darwin.apple_sdk.frameworks.SystemConfiguration

# https://github.com/NixOS/nixpkgs/issues/126182
libiconv
] ++ lib.optionals (stdenv.system != "aarch64-darwin") [
] ++ lib.optionals (!stdenv.isDarwin) [
cargo-watch # broken: https://github.com/NixOS/nixpkgs/issues/146349
];
# nixWithFlakes allows pre v2.4 nix installations to use
# flake commands (like `nix flake update`)
nixWithFlakes = pkgs.writeShellScriptBin "nix" ''
exec ${pkgs.nixFlakes}/bin/nix --experimental-features "nix-command flakes" "$@"
'';
shellHook = ''
# on mac os `bin/pwd -P` returns the canonical path on case insensitive file-systems
my_pwd=$(/bin/pwd -P 2> /dev/null || pwd)

export PATH=${pkgs.xdot}/bin:$PATH
export PATH=''${my_pwd}/bin:$PATH
'';
in {
devShell = pkgs.mkShell {
shellHook = shellHook;
buildInputs = with pkgs;
[
fenix.packages.${system}.rust-analyzer
nixWithFlakes
nixpkgs-fmt
git
mdbook # make-doc, documentation generation
rustToolchain
] ++ rustDeps;

Expand Down
Loading