Page MenuHomePhabricator
Differential D4294

[nix] Add dependencies needed to compile native modules
ClosedPublic
Actions

Authored by • jon on Jun 19 2022, 11:20 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Apr 7, 1:24 AM
Unknown Object (File)
Sun, Apr 6, 5:08 AM
Unknown Object (File)
Sun, Apr 6, 5:08 AM
Unknown Object (File)
Sun, Apr 6, 5:08 AM
Unknown Object (File)
Sun, Apr 6, 5:08 AM
Unknown Object (File)
Sun, Apr 6, 5:08 AM
Unknown Object (File)
Sun, Apr 6, 5:07 AM
Unknown Object (File)
Fri, Apr 4, 3:09 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul
tomek

Details

Reviewers
• max
• karol
varun
ashoat
Commits
rCOMMc377946343a2: [nix] Add dependencies needed to compile native modules
Summary

Dependencies needed for building cpp services through nix

Depends on D4293

Test Plan

nix develop

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• jon created this revision.Jun 19 2022, 11:20 AM
Herald added subscribers: • abosh, atul, • adrian and 2 others. · View Herald TranscriptJun 19 2022, 11:20 AM
• jon edited the summary of this revision. (Show Details)Jun 19 2022, 11:21 AM
• jon added a parent revision: D4293: [services] Bump libuv compatibility.
• jon added a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jun 19 2022, 11:26 AM
Harbormaster completed remote builds in B9804: Diff 13568.Jun 19 2022, 11:30 AM
• jon requested review of this revision.Jun 19 2022, 11:30 AM
• jon retitled this revision from Add dependencies needed to compile native modules to [nix] Add dependencies needed to compile native modules.Jun 19 2022, 11:31 AM
• jon updated this revision to Diff 13573.Jun 19 2022, 1:42 PM

Additional dependencies

• jon updated this revision to Diff 13580.Jun 19 2022, 3:45 PM

Make openssl available to all platforms for grpc compatibility

Harbormaster failed remote builds in B9816: Diff 13580!Jun 19 2022, 3:48 PM
Harbormaster completed remote builds in B9809: Diff 13573.Jun 19 2022, 4:10 PM
ashoat added inline comments.Jun 20 2022, 9:15 AM
nix/overlay.nix
32

I guess we're doing this so this line works with the new CMake config changes?

• jon marked an inline comment as done.Jun 22 2022, 7:57 PM
• jon added inline comments.
nix/overlay.nix
32

The Session.hh is used in our code, although it's not meant to be publicly exposed by upstream. I added it so I didn't have to also touch c++.

The Session.hh just exposes a bit of abstraction on top of the olm primitives, the intent upstream is for the headers to only be used for their unit tests (which is why it's not exposed publicly)

https://gitlab.matrix.org/matrix-org/olm/-/blob/master/include/olm/session.hh#L20

Harbormaster completed remote builds in B9816: Diff 13580.Jun 22 2022, 8:01 PM
varun added 1 blocking reviewer(s): varun.Jun 23 2022, 12:24 PM
varun accepted this revision.Jun 26 2022, 9:30 PM
This revision is now accepted and ready to land.Jun 26 2022, 9:30 PM
Herald added a reviewer: ashoat. · View Herald TranscriptJun 26 2022, 9:30 PM
This revision now requires review to proceed.Jun 26 2022, 9:30 PM
• max accepted this revision.Jun 27 2022, 2:28 AM
ashoat accepted this revision.Jun 28 2022, 11:59 AM

Please adjust line length before landing!

nix/overlay.nix
29–32

Makes sense!! Can you make sure to limit all lines to 80 chars?

This revision is now accepted and ready to land.Jun 28 2022, 11:59 AM
Closed by commit rCOMMc377946343a2: [nix] Add dependencies needed to compile native modules (authored by • jon). · Explain WhyJun 29 2022, 12:29 PM
This revision was automatically updated to reflect the committed changes.
• jon marked an inline comment as done.
• jon added a commit: rCOMMc377946343a2: [nix] Add dependencies needed to compile native modules.
• jon marked an inline comment as done.Jun 29 2022, 12:30 PM
• jon added inline comments.
nix/overlay.nix
29–32

Sorry, was pairing with varun, and landed to unblock some work we were doing, will tackle this in another diff

ashoat added inline comments.Jun 29 2022, 12:31 PM
nix/overlay.nix
29–32

No problem, can you make a Linear task so we don't forget? (Or alternately, feel free to put a diff up right away)

• jon added a child revision: D4424: [nix] Lint line length.Jun 30 2022, 2:26 PM
• jon marked 2 inline comments as done.Jun 30 2022, 2:27 PM
• jon added inline comments.
nix/overlay.nix
29–32

https://phab.comm.dev/D4424

Sorry about that

• jon added a child revision: D4430: [Services] Generate Protobuf files with CMake.Jul 3 2022, 8:51 AM
• jon added a child revision: D4564: [Nix] Add cmake-format to dev shell.Jul 18 2022, 2:52 PM
• jon removed a child revision: D4564: [Nix] Add cmake-format to dev shell.Jul 18 2022, 3:40 PM
• jon added a child revision: D4298: [services] Export sqlite_orm as CMake project.Jul 18 2022, 5:30 PM
atul added a child revision: D4564: [Nix] Add cmake-format to dev shell.Jul 18 2022, 5:59 PM
• jon added a child revision: D4448: Update android build with cmake changes.Jul 18 2022, 7:01 PM
• jon added a child revision: D4483: [Nix] Support building Android through gradle on Linux.Jul 20 2022, 12:41 PM
• jon removed a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 25 2022, 9:11 PM
• jon added a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 25 2022, 9:17 PM
• jon removed a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 25 2022, 9:28 PM
• jon added a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 25 2022, 9:33 PM
• jon removed a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 26 2022, 8:19 AM
• jon added a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 27 2022, 11:59 AM
• jon removed a child revision: D4564: [Nix] Add cmake-format to dev shell.Jul 27 2022, 12:25 PM
• jon removed a child revision: D3867: [services] Export comm's grpc generated files as cmake project.Jul 28 2022, 5:37 PM
• jon removed a child revision: D4298: [services] Export sqlite_orm as CMake project.Aug 17 2022, 9:40 AM

Revision Contents
Changeset List

PathSize
nix/
12 lines
7 lines

Diff 13580

View Options

nix/dev-shell.nix

Show First 20 Lines • Show All 55 Lines • ▼ Show 20 Lines networks:
- services-net - services-net
build: build:
dockerfile: services/identity/Dockerfile dockerfile: services/identity/Dockerfile
context: ../ context: ../
image: commapp/identity-server:0.1 image: commapp/identity-server:0.1
container_name: identity-server container_name: identity-server
ports: ports:
- "${COMM_SERVICES_PORT_IDENTITY}:50051" - "${COMM_SERVICES_PORT_IDENTITY}:50051"
# localstack
localstack:
image: localstack/localstack
container_name: localstack
hostname: localstack
ports:
- "4566:4566"
environment:
- SERVICES=s3,dynamodb
- DATA_DIR=${TMPDIR}/localstack/data
- HOSTNAME_EXTERNAL=localstack
volumes:
jimUnsubmitted
Not Done
Inline Actions

Why bind mount a temp directory instead of using a data volume? It's just gonna create issues with permissions. Also ${TMPDIR} is not used to refer to a path in both the host and the container which is a bad idea.

jim: Why bind mount a temp directory instead of using a data volume? It's just gonna create issues…
- ${TMPDIR}:/tmp/localstack
networks:
- services-net
View Options

nix/overlay.nix

Show First 20 Lines • Show All 55 Lines • ▼ Show 20 Lines networks:
- services-net - services-net
build: build:
dockerfile: services/identity/Dockerfile dockerfile: services/identity/Dockerfile
context: ../ context: ../
image: commapp/identity-server:0.1 image: commapp/identity-server:0.1
container_name: identity-server container_name: identity-server
ports: ports:
- "${COMM_SERVICES_PORT_IDENTITY}:50051" - "${COMM_SERVICES_PORT_IDENTITY}:50051"
# localstack
localstack:
image: localstack/localstack
container_name: localstack
hostname: localstack
ports:
- "4566:4566"
environment:
- SERVICES=s3,dynamodb
- DATA_DIR=${TMPDIR}/localstack/data
- HOSTNAME_EXTERNAL=localstack
volumes:
jimUnsubmitted
Not Done
Inline Actions

Why bind mount a temp directory instead of using a data volume? It's just gonna create issues with permissions. Also ${TMPDIR} is not used to refer to a path in both the host and the container which is a bad idea.

jim: Why bind mount a temp directory instead of using a data volume? It's just gonna create issues…
- ${TMPDIR}:/tmp/localstack
networks:
- services-net