Make dfx buildable from top-level directory#283

Merged

hansl merged 2 commits intomasterfrom

Jan 6, 2020

Contributor

nmattia commented Jan 6, 2020

To build dfx, run nix-build ./dfx.nix.

nmattia requested review from a team and basvandijk

January 6, 2020 14:14

basvandijk approved these changes

View reviewed changes


          Make dfx buildable from top-level directory

2fcc15d

To build dfx, run `nix-build ./dfx.nix`.

nmattia force-pushed the nm-dfx-local branch from a7e4c1c to 2fcc15d Compare

January 6, 2020 15:20

nmattia added the automerge-squash label


          Merge branch 'master' into nm-dfx-local

31e9baa

hansl merged commit af9229b into master

mergify bot deleted the nm-dfx-local branch

January 6, 2020 17:49

mergify bot removed the automerge-squash label

dfinity-bot added a commit that referenced this pull request


          build: niv common: update 4b93b09b -> 4a65b834

b1272d7

## Changelog for common:
Branch: master
Commits: [dfinity-lab/common@4b93b09b...4a65b834](https://github.com/dfinity-lab/common/compare/4b93b09b796fbb62f3c4789e7527a0765eae0cdb...4a65b8341dd4cff0059947b7f2254d09219a90db)

* [`3d1f1d49`](https://github.com/dfinity-lab/common/commit/3d1f1d49108941e5008d0c423cab2793b2ea3862) Upgrade to rustc 1.45 using the standardized upgrade workflow ([dfinity-lab/common⁠#265](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/265))
* [`ea141762`](https://github.com/dfinity-lab/common/commit/ea14176247375af2f762d92d5413c05ab9b40152) Add nasm's office laptop key
* [`4cc01d21`](https://github.com/dfinity-lab/common/commit/4cc01d21c5ea4835da56753c8414930c33bd6ce3) niv niv: update fad2a6cb -> b50a0107
* [`71fc95ea`](https://github.com/dfinity-lab/common/commit/71fc95ea0e67ee6fb6b5225482e164de9f9edc52) niv niv: update b50a0107 -> dd13098d
* [`87c2ae9a`](https://github.com/dfinity-lab/common/commit/87c2ae9a01b6cc1ec4ad67596181ed42ed6f4d61) Add Islam to accounts.nix
* [`62ec3d1a`](https://github.com/dfinity-lab/common/commit/62ec3d1ae61891e525e12ef34534db4a7e8f28d6) nix-fmt
* [`7c53b963`](https://github.com/dfinity-lab/common/commit/7c53b963ad327f03626ab59cb1a2c92c7b27bab8) add account for ssh
* [`6abecb30`](https://github.com/dfinity-lab/common/commit/6abecb3075ea8f3bbb449a7faf411ffd16211de1) pkgs/overlays/accounts.nix: fixed account for chenyan
* [`181196c0`](https://github.com/dfinity-lab/common/commit/181196c0561bffa598070705e65ebb466434573f) niv cargo2nix: update c5200932 -> 688f9272
* [`abffb600`](https://github.com/dfinity-lab/common/commit/abffb60072633f0c7fd4c4880196c819bb01c159) add ssh pk ([dfinity-lab/common⁠#273](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/273))
* [`f550021d`](https://github.com/dfinity-lab/common/commit/f550021df8697aa29c9ad71dc1220f4a3bfa09b9) adding ssh key for Hassen
* [`f1f7f69a`](https://github.com/dfinity-lab/common/commit/f1f7f69a65aa03aabc334663b066ca723dec1c28) formatting
* [`cd7f0b51`](https://github.com/dfinity-lab/common/commit/cd7f0b51f893344ed974f1b3bbd47fd3bc24d16d) fix email address
* [`25b1d9f4`](https://github.com/dfinity-lab/common/commit/25b1d9f4ce2040d7bebd0a7a6fd172720b6b1559) run nix-fmt
* [`c5fe2afa`](https://github.com/dfinity-lab/common/commit/c5fe2afacad8a09d1318f1b87a6aa057d2eadeee) Update ssh key for Khushboo
* [`00a59776`](https://github.com/dfinity-lab/common/commit/00a59776062f35e64d1527bcc8165a6c16039090) Add Stavros to authorized keys
* [`aff78c26`](https://github.com/dfinity-lab/common/commit/aff78c262d7415d9d07f41a6b3be0d6d315e881e) niv niv: update dd13098d -> 29ddaaf4
* [`5a552545`](https://github.com/dfinity-lab/common/commit/5a552545638885aaf1333d22b94199be97309a84) add some more metadata debugging information for macos
* [`a3fc9b6c`](https://github.com/dfinity-lab/common/commit/a3fc9b6c737bc4bd17e7fef0cba1eed0c67be274) Give dsd access to IC-OS instances
* [`d86c8b6c`](https://github.com/dfinity-lab/common/commit/d86c8b6cac5f2f1387d3459d615f2da0fba72097) Clarify Xfmt commands
* [`d0ceee12`](https://github.com/dfinity-lab/common/commit/d0ceee12a8991c7a623d20d708e7a5e56b76b8b6) mk-jobset.nix: support excluding jobs for certain systems from all-systems-go
* [`129dcc07`](https://github.com/dfinity-lab/common/commit/129dcc07ccf90440e0ececf5e8cf1a5a0318f8fe) Add Alin's SSH key ([dfinity-lab/common⁠#283](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/283))
* [`7ac40580`](https://github.com/dfinity-lab/common/commit/7ac4058099d16318690cdfc02b1dce09be733fc7) pkgs/overlays/accounts.nix: update bas' SSH key from rsa to ed25519
* [`3fb04d11`](https://github.com/dfinity-lab/common/commit/3fb04d11ea3a760b759998dc50b1c9b42af88e4a) cargo2nix.nix: export cratesRelease and cratesDebug from mkDfinityWorkspace
* [`458c29b4`](https://github.com/dfinity-lab/common/commit/458c29b48b3256b23daed9fcaf61c2d35565f3d3) niv cargo2nix: update 688f9272 -> 20083037 ([dfinity-lab/common⁠#285](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/285))
* [`cf39e301`](https://github.com/dfinity-lab/common/commit/cf39e301bc4d5e0ac60e65b7f09c8e9da85593f6) nix/sources.json: cargo-audit: v0.11.2 -> v0.12.1

mergify bot pushed a commit that referenced this pull request


          build: niv common: update 4b93b09b -> 4a65b834 (#1084)

fcb1416

## Changelog for common:
Branch: master
Commits: [dfinity-lab/common@4b93b09b...4a65b834](https://github.com/dfinity-lab/common/compare/4b93b09b796fbb62f3c4789e7527a0765eae0cdb...4a65b8341dd4cff0059947b7f2254d09219a90db)

* [`3d1f1d49`](https://github.com/dfinity-lab/common/commit/3d1f1d49108941e5008d0c423cab2793b2ea3862) Upgrade to rustc 1.45 using the standardized upgrade workflow ([dfinity-lab/common⁠#265](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/265))
* [`ea141762`](https://github.com/dfinity-lab/common/commit/ea14176247375af2f762d92d5413c05ab9b40152) Add nasm's office laptop key
* [`4cc01d21`](https://github.com/dfinity-lab/common/commit/4cc01d21c5ea4835da56753c8414930c33bd6ce3) niv niv: update fad2a6cb -> b50a0107
* [`71fc95ea`](https://github.com/dfinity-lab/common/commit/71fc95ea0e67ee6fb6b5225482e164de9f9edc52) niv niv: update b50a0107 -> dd13098d
* [`87c2ae9a`](https://github.com/dfinity-lab/common/commit/87c2ae9a01b6cc1ec4ad67596181ed42ed6f4d61) Add Islam to accounts.nix
* [`62ec3d1a`](https://github.com/dfinity-lab/common/commit/62ec3d1ae61891e525e12ef34534db4a7e8f28d6) nix-fmt
* [`7c53b963`](https://github.com/dfinity-lab/common/commit/7c53b963ad327f03626ab59cb1a2c92c7b27bab8) add account for ssh
* [`6abecb30`](https://github.com/dfinity-lab/common/commit/6abecb3075ea8f3bbb449a7faf411ffd16211de1) pkgs/overlays/accounts.nix: fixed account for chenyan
* [`181196c0`](https://github.com/dfinity-lab/common/commit/181196c0561bffa598070705e65ebb466434573f) niv cargo2nix: update c5200932 -> 688f9272
* [`abffb600`](https://github.com/dfinity-lab/common/commit/abffb60072633f0c7fd4c4880196c819bb01c159) add ssh pk ([dfinity-lab/common⁠#273](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/273))
* [`f550021d`](https://github.com/dfinity-lab/common/commit/f550021df8697aa29c9ad71dc1220f4a3bfa09b9) adding ssh key for Hassen
* [`f1f7f69a`](https://github.com/dfinity-lab/common/commit/f1f7f69a65aa03aabc334663b066ca723dec1c28) formatting
* [`cd7f0b51`](https://github.com/dfinity-lab/common/commit/cd7f0b51f893344ed974f1b3bbd47fd3bc24d16d) fix email address
* [`25b1d9f4`](https://github.com/dfinity-lab/common/commit/25b1d9f4ce2040d7bebd0a7a6fd172720b6b1559) run nix-fmt
* [`c5fe2afa`](https://github.com/dfinity-lab/common/commit/c5fe2afacad8a09d1318f1b87a6aa057d2eadeee) Update ssh key for Khushboo
* [`00a59776`](https://github.com/dfinity-lab/common/commit/00a59776062f35e64d1527bcc8165a6c16039090) Add Stavros to authorized keys
* [`aff78c26`](https://github.com/dfinity-lab/common/commit/aff78c262d7415d9d07f41a6b3be0d6d315e881e) niv niv: update dd13098d -> 29ddaaf4
* [`5a552545`](https://github.com/dfinity-lab/common/commit/5a552545638885aaf1333d22b94199be97309a84) add some more metadata debugging information for macos
* [`a3fc9b6c`](https://github.com/dfinity-lab/common/commit/a3fc9b6c737bc4bd17e7fef0cba1eed0c67be274) Give dsd access to IC-OS instances
* [`d86c8b6c`](https://github.com/dfinity-lab/common/commit/d86c8b6cac5f2f1387d3459d615f2da0fba72097) Clarify Xfmt commands
* [`d0ceee12`](https://github.com/dfinity-lab/common/commit/d0ceee12a8991c7a623d20d708e7a5e56b76b8b6) mk-jobset.nix: support excluding jobs for certain systems from all-systems-go
* [`129dcc07`](https://github.com/dfinity-lab/common/commit/129dcc07ccf90440e0ececf5e8cf1a5a0318f8fe) Add Alin's SSH key ([dfinity-lab/common⁠#283](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/283))
* [`7ac40580`](https://github.com/dfinity-lab/common/commit/7ac4058099d16318690cdfc02b1dce09be733fc7) pkgs/overlays/accounts.nix: update bas' SSH key from rsa to ed25519
* [`3fb04d11`](https://github.com/dfinity-lab/common/commit/3fb04d11ea3a760b759998dc50b1c9b42af88e4a) cargo2nix.nix: export cratesRelease and cratesDebug from mkDfinityWorkspace
* [`458c29b4`](https://github.com/dfinity-lab/common/commit/458c29b48b3256b23daed9fcaf61c2d35565f3d3) niv cargo2nix: update 688f9272 -> 20083037 ([dfinity-lab/common⁠#285](http://r.duckduckgo.com/l/?uddg=https://github.com/dfinity-lab/common/issues/285))
* [`cf39e301`](https://github.com/dfinity-lab/common/commit/cf39e301bc4d5e0ac60e65b7f09c8e9da85593f6) nix/sources.json: cargo-audit: v0.11.2 -> v0.12.1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet