This repository has been archived by the owner on May 20, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #226 from holochain/pr/update-main
Merge develop changes to master
- Loading branch information
Showing
27 changed files
with
491 additions
and
313 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,5 @@ | ||
| # Changelog | ||
| The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). | ||
| This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). | ||
| l | ||
| {{ version-heading }} | ||
|
|
||
| ### Added | ||
| * Convenient script for running the holonix RSM alpha shell. The short-term command will look like this: | ||
|
|
||
| `$(nix-build https://nightly.holochain.love --no-link -A pkgs.holonix)/bin/holonix` | ||
| * `hn-introspect` script to list which holochain packages were pulled in for the nix-shell | ||
|
|
||
| #### RSM binaries for Linux | ||
| * holochain: 0.0.1 | ||
| * dna-util: 0.0.1 lair-keystore | ||
| * lair-keystore: 0.0.1-alpha.10 | ||
| * kitsune-p2p-proxy: 0.0.1 | ||
|
|
||
| Binaries are available for Darwin and Linux on `x86_64-linux` and `arm64`. | ||
|
|
||
| #### Configurable holochain/holo-nixpkgs versions | ||
| * Add a section for holo-nixpkgs to config.nix | ||
| * Introduce arguments for choosing the included holochain binaries: | ||
| * holochainVersionId: can be one of "hpos", "main", "develop", or "custom" as of now. | ||
| * holochainVersion: if `holochainVersionId` is "custom", this specifies a set with holochain source information. Example: | ||
| ```nix | ||
| version = "2021-02-05"; | ||
| rev = "fd8049a48ac12ef3e190b48a79ffe8d8b5948caa"; | ||
| sha256 = "065kkmmr8b5ngjqpr7amd7l4dcakj2njx168qvr5z47mmqs9xbgw"; | ||
| cargoSha256 = "1ix8ihlizjsmx8xaaxknbl0wkyck3kc98spipx5alav8ln4wf46s"; | ||
| ``` | ||
|
|
||
| Altogether the invocation could look like: | ||
| ```console | ||
| nix-shell . --argstr holochainVersionId "custom" --arg holochainVersion '{ | ||
| version = "custom"; | ||
| rev = "fd8049a48ac12ef3e190b48a79ffe8d8b5948caa"; | ||
| sha256 = "065kkmmr8b5ngjqpr7amd7l4dcakj2njx168qvr5z47mmqs9xbgw"; | ||
| cargoSha256 = "1ix8ihlizjsmx8xaaxknbl0wkyck3kc98spipx5alav8ln4wf46s"; | ||
| }' | ||
| ``` | ||
| * holochainOtherDepsNames: list of package names to include in the shell. Names are keys to `holo-nixpkgs`. Example that is also the default: `[ "lair-keystore" ]` | ||
|
|
||
|
|
||
|
|
||
| ### Changed | ||
| * perf: 4.19 -> 5.4 | ||
| * Removed the `HC_TARGET_PREFIX` env var in favor of the `NIX_ENV_PREFIX` env var | ||
|
|
||
| ### Deprecated | ||
|
|
||
| ### Removed | ||
| * cli (hc) | ||
| * n3c | ||
| * wasm tools | ||
| * rust nightly | ||
| * sim2h_server | ||
| * newrelic tooling | ||
| * saml2aws tool and AWS specific CI jobs | ||
| * trycp_server | ||
|
|
||
| ### Fixed | ||
|
|
||
| ### Security | ||
| {{ version-heading }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| # Holonix | ||
|
|
||
| Read all about it at https://docs.holochain.love | ||
| Read all about it at https://developer.holochain.org/docs/install/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| #! /usr/bin/env nix-shell | ||
| #! nix-shell -i bash -p bash -p cachix -I nixpkgs="channel:nixos-21.05" | ||
|
|
||
| # nix-shell -i bash -p "((import ./config.nix).holochain-nixpkgs.importFn {}).pkgs.cachix" | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| export PATHS_PREBUILD_FILE="${HOME}/.store-path-pre-build" | ||
| export NIX_PATH=nixpkgs=$(nix eval --raw '((import ./config.nix).holochain-nixpkgs.pathFn {})') | ||
|
|
||
| case ${1} in | ||
| setup) | ||
| if [[ -n ${CACHIX_AUTH_TOKEN:-} ]]; then | ||
| echo Using CACHIX_AUTH_TOKEN | ||
| cachix --verbose authtoken ${CACHIX_AUTH_TOKEN} | ||
| fi | ||
| cachix --verbose use -m user-nixconf ${CACHIX_NAME:?} | ||
| nix path-info --all > "${PATHS_PREBUILD_FILE}" | ||
| ;; | ||
|
|
||
| push) | ||
| comm -13 <(sort "${PATHS_PREBUILD_FILE}" | grep -v '\.drv$') <(nix path-info --all | grep -v '\.drv$' | sort) | cachix --verbose push ${CACHIX_NAME:?} | ||
| ;; | ||
| esac |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| #!/usr/bin/env bash | ||
| #!/usr/bin/env sh | ||
| set -xe | ||
| mkdir -p ~/.config/nix/ | ||
| cat > ~/.config/nix/nix.conf << 'EOF' | ||
|
|
||
Oops, something went wrong.