Skip to content

wip: buildling all our stuff with nix #994

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

Closed
d4hines wants to merge 1 commit into from
Closed

wip: buildling all our stuff with nix #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions deku-p/deku-toolkit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
],
"author": "[email protected]",
"license": "ISC",
"devDependencies": {
"dependencies": {
"typescript": "^4.7.4",
"@types/bs58check": "^2.1.0",
"@types/node": "^18.7.13",
Expand All @@ -29,9 +29,7 @@
"rollup": "^2.79.1",
"rollup-plugin-json": "^4.0.0",
"rollup-plugin-sourcemaps": "^0.6.3",
"rollup-plugin-typescript2": "^0.34.0"
},
"dependencies": {
"rollup-plugin-typescript2": "^0.34.0",
"@tzstamp/helpers": "^0.3.4",
"@taquito/taquito": "^13.0.1",
"blakejs": "^1.2.1",
Expand Down
3 changes: 1 addition & 2 deletions deku-p/src/core/bin/node/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@
fmt.cli
logs.cli
logs.threaded
piaf
routes)
piaf)
(preprocess
(pps ppx_let_binding ppx_deriving_cmdliner ppx_yojson_conv)))

Expand Down
2 changes: 1 addition & 1 deletion dune
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(data_only_dirs flextesa_chain node_modules)
(data_only_dirs flextesa_chain node_modules nix)

(env
(static
Expand Down
19 changes: 19 additions & 0 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,25 @@
tuna = self'.packages.tuna;
deploy-rs = deploy-rs.packages.${system}.default;
};
checks = {
ensure_all_build = pkgs.symlinkJoin {
name = "all";
paths = with self';
with packages; [
packages."@marigold-dev/deku-c-toolkit"
packages."@marigold-dev/deku-p-sdk"
packages."@marigold-dev/deku-toolkit"
decookies-vm
deku
deku-static
deku-toolkit-nodejs-example
deku-toolkit-react-example
docker
tuna
website
];
};
};
};
};
flake = {
Expand Down
Binary file modified networks/betanets/fleet.nix
View file
Open in desktop
Binary file not shown.
Binary file modified networks/betanets/modules/promtail.nix
View file
Open in desktop
Binary file not shown.
93 changes: 78 additions & 15 deletions nix/deku-c/tuna.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,39 @@
{
nix-filter,
lib,
buildDunePackage,
zarith,
ppx_deriving,
ppx_yojson_conv,
yojson,
wasm,
data-encoding,
tezos-micheline,
core,
core_unix,
ppx_jane,
alcotest,
{ nix-filter
, lib
, buildDunePackage
# This is probably a super set of what is actually needed
# TODO: maybe we should figure out how to re-use deku.nix?
, eio
, eio_main
, zarith
, ppx_deriving
, ppx_yojson_conv
, data-encoding
, wasm
, tezos-micheline
, ppx_deriving_cmdliner
, mirage-crypto
, mirage-crypto-ec
, mirage-crypto-rng
, digestif
, tezos-crypto
, secp256k1-internal
, piaf
, cmdliner
, ppx_blob
, caqti
, caqti-driver-sqlite3
, dream
, caqti-eio
, routes
, ppx_rapper
, ppx_rapper_eio
, ezgzip
, ppx_jane # TODO: do we need this?
, core
, core_unix
, yojson
, alcotest
}:
buildDunePackage rec {
pname = "deku";
Expand All @@ -24,17 +45,59 @@ buildDunePackage rec {
include = [
"deku.opam"
"deku-c/tunac"
"deku-c/interpreter"
"deku-c/wasm-vm-ocaml"
# TODO: why isn't tuna part of the deku build? Seems like we duplicate stuff here.
"deku-p/src/core"
"dune-project"
];
exclude = [
"deku-p/src/core/bin"
];
};

propagatedBuildInputs = [
eio
eio_main
zarith
ppx_deriving
ppx_yojson_conv
data-encoding
wasm
tezos-micheline
ppx_deriving_cmdliner
mirage-crypto
mirage-crypto-ec
mirage-crypto-rng
digestif
tezos-micheline
tezos-crypto
ppx_deriving
ppx_yojson_conv
zarith
digestif
mirage-crypto
mirage-crypto-ec
mirage-crypto-rng
secp256k1-internal
piaf
cmdliner
ppx_blob
data-encoding
caqti
caqti-driver-sqlite3
ppx_deriving_cmdliner
dream
eio
eio_main
caqti-eio
routes
ppx_rapper
ppx_rapper_eio
ezgzip
ppx_jane # TODO: do we need this?
core
core_unix
];

buildInputs = [
Expand Down
1 change: 1 addition & 0 deletions nix/deku-p/deku.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ in
ppx_deriving_cmdliner
dream
eio
eio_main
caqti-eio
routes
ppx_rapper
Expand Down
1 change: 0 additions & 1 deletion website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
"@taquito/michelson-encoder": "^14.0.0",
"@taquito/remote-signer": "^14.0.0",
"@taquito/rpc": "^14.0.0",
"@taquito/sapling": "^14.0.0",
"@taquito/signer": "^14.0.0",
"@taquito/taquito": "^14.0.0",
"@taquito/tezbridge-wallet": "^14.0.0",
Expand Down
10 changes: 10 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4094,9 +4094,19 @@
version "0.1.12"
dependencies:
"@taquito/taquito" "^13.0.1"
"@types/bs58check" "^2.1.0"
"@types/node" "^18.7.13"
"@typescript-eslint/eslint-plugin" "^5.35.1"
"@typescript-eslint/parser" "^5.35.1"
"@tzstamp/helpers" "^0.3.4"
blakejs "^1.2.1"
bs58check "^2.1.2"
eslint "^8.23.0"
rollup "^2.79.1"
rollup-plugin-json "^4.0.0"
rollup-plugin-sourcemaps "^0.6.3"
rollup-plugin-typescript2 "^0.34.0"
typescript "^4.7.4"

"@mdx-js/mdx@^1.6.22":
version "1.6.22"
Expand Down