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

nix: upgrade common #65

Merged
merged 2 commits into from
Oct 9, 2019
Merged

nix: upgrade common #65

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00a38b3
nix: upgrade common
basvandijk Oct 9, 2019
8b99fac
nix: require COMMON to be an absolute path
basvandijk Oct 9, 2019
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
11 changes: 5 additions & 6 deletions nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@ let
# The `common` repo provides code (mostly Nix) that is used in the
# `infra`, `dfinity` and `sdk` repositories.
#
# To conveniently test changes to a local `common` repo you point
# the `COMMON` environment variable to it. The path should be
# relative to the root of the `sdk` repo. For example:
# To conveniently test changes to a local `common` repo you set the `COMMON`
# environment variable to an absolute path of it. For example:
#
# COMMON="../common" nix-build -A rust-workspace
# COMMON="$(realpath ../common)" nix-build -A rust-workspace
commonSrc =
let localCommonSrc = builtins.getEnv "COMMON"; in
if localCommonSrc != ""
then ../. + "/${localCommonSrc}"
then localCommonSrc
else builtins.fetchGit {
url = "ssh://git@github.com/dfinity-lab/common";
rev = "9f7598dfe4a5d19985d6a61dfc1c0fe2b286ce91";
rev = "633ff01d07bac061001d5a2713363ef3de5df2df";
};
in import commonSrc {
inherit system crossSystem config;
Expand Down