Skip to content

Use revision of dev that fixes builds on macOS SDK-34 #86

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

Merged
paulyoung merged 4 commits into from
Nov 29, 2018
Merged

Use revision of dev that fixes builds on macOS SDK-34 #86

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9180db
Use revision of dev that fixes builds on macOS
paulyoung Nov 28, 2018
ef38b51
Use nixpkgs from dev
paulyoung Nov 28, 2018
402115a
Revert "Use nixpkgs from dev"
paulyoung Nov 28, 2018
457940b
Copy file from dev/nix/nixpkgs.nix
paulyoung Nov 28, 2018
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
2 changes: 1 addition & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pipeline {
steps {
sh 'git submodule update --init --recursive'
sh 'git clone --recursive git@github.com:dfinity-lab/dev nix/dev'
sh 'git -C nix/dev checkout fb8fcf3833208fb8f1d6186394dccb483b3272ae'
sh 'git -C nix/dev checkout 7f448441767b06656b1fb523c84006afbdacbd42'
sh 'git -C nix/dev submodule update --init --recursive'
}
}
Expand Down
2 changes: 1 addition & 1 deletion default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ nixpkgs ? (import ./nix/nixpkgs.nix) {},
{ nixpkgs ? (import ./nix/dev/nix/nixpkgs.nix) {},
Comment thread
paulyoung marked this conversation as resolved.
Outdated
test-dvm ? true,
dvm ? null,
v8 ? true,
Expand Down
6 changes: 0 additions & 6 deletions nix/nixpkgs.nix
View file
Open in desktop

This file was deleted.