Page MenuHomePhabricator
Files F3360118

D3874.diff
No OneTemporary
Actions

D3874.diff
View Options

diff --git a/flake.lock b/flake.lock
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
"nodes": {
"nixpkgs": {
"locked": {
- "lastModified": 1641404362,
- "narHash": "sha256-8j21rw0xwwuiz8uOybm6gbeQIfAga/cwovzr3z1xzOg=",
+ "lastModified": 1651114127,
+ "narHash": "sha256-/lLC0wkMZkAdA5e1W76SnJzbhfOGDvync3VRHJMtAKk=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "defafc9a220440180a34f923be9772d9c89a8197",
+ "rev": "6766fb6503ae1ebebc2a9704c162b2aef351f921",
"type": "github"
},
"original": {
diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix
--- a/nix/dev-shell.nix
+++ b/nix/dev-shell.nix
@@ -1,10 +1,21 @@
{ mkShell
, stdenv
, lib
+, amqp-cpp
, arcanist
+, cargo
+, cmake
+, cryptopp
, darwin
+, grpc
+, libuv
, nodejs-16_x
-, protobuf3_15
+, pkg-config
+, protobuf_3_15_cmake
+, python2
+, python3
+, watchman
+, rustfmt
, yarn
}:
@@ -12,17 +23,39 @@
# programs which are meant to be executed should go here
nativeBuildInputs = [
+ # generic development
arcanist
+
+ # node development
nodejs-16_x
- protobuf3_15
yarn
+ watchman # react native
+ python2
+ python3
+
+ # native dependencies
+ # C/CXX toolchains are already brought in with mkShell
+ # Identity Service
+ cargo # includes rustc
+ rustfmt
+
+ # Tunnelbroker + CMake
+ amqp-cpp
+ cryptopp
+ cmake
+ libuv
+ pkg-config
+ protobuf_3_15_cmake
+ grpc
+
];
# include any libraries buildInputs
buildInputs = [
- protobuf3_15 # exposes both a library and a command, thus should appear in both inputs
+ protobuf_3_15_cmake # exposes both a library and a command, thus should appear in both inputs
] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [
CoreFoundation
+ CoreServices
Security
]);

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 25, 12:02 PM (16 h, 23 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2579621
Default Alt Text
D3874.diff (1 KB)

Event Timeline