From b5fe4e1a7389636e55e77da3bd6b09a5b82a75b7 Mon Sep 17 00:00:00 2001 From: vsoch Date: Mon, 21 Nov 2022 15:27:52 -0700 Subject: [PATCH 1/4] adding start of dev environments for conveyorlc I still need to make a conduit package Signed-off-by: vsoch --- conveyorlc/README.md | 11 +++++++++++ conveyorlc/devbox.json | 11 +++++++++++ conveyorlc/devenv.nix | 26 ++++++++++++++++++++++++++ conveyorlc/devenv.yaml | 3 +++ conveyorlc/shell.nix | 9 +++++++++ conveyorlc/uptodate.yaml | 7 +++++++ 6 files changed, 67 insertions(+) create mode 100644 conveyorlc/README.md create mode 100644 conveyorlc/devbox.json create mode 100644 conveyorlc/devenv.nix create mode 100644 conveyorlc/devenv.yaml create mode 100644 conveyorlc/shell.nix create mode 100644 conveyorlc/uptodate.yaml diff --git a/conveyorlc/README.md b/conveyorlc/README.md new file mode 100644 index 0000000..d90830e --- /dev/null +++ b/conveyorlc/README.md @@ -0,0 +1,11 @@ +# conveyorlc + +This is an attempt to create a base environment and we need. +Nix just has one version, so we have to use that. + +- openmpi +- boost@1.72 (with mpi bindings) +- conduit@0.8.4 +hdf5 +- openbabel@3.0.0 ~python ~gui + +Note that we are just missing conduit (@vsoch is going to make a nix package). diff --git a/conveyorlc/devbox.json b/conveyorlc/devbox.json new file mode 100644 index 0000000..cdf2c3b --- /dev/null +++ b/conveyorlc/devbox.json @@ -0,0 +1,11 @@ +{ + "packages": [ + "boost172", + "openbabel", + "python3", + "openmpi", + ], + "shell": { + "init_hook": null + } +} diff --git a/conveyorlc/devenv.nix b/conveyorlc/devenv.nix new file mode 100644 index 0000000..7b99efa --- /dev/null +++ b/conveyorlc/devenv.nix @@ -0,0 +1,26 @@ +{ pkgs, ... }: + +{ + # https://devenv.sh/basics/ + env.GREET = "devenv"; + + # https://devenv.sh/packages/ + packages = [ pkgs.openmpi pkgs.boost172 pkgs.openbabel pkgs.python3 ]; + + enterShell = '' + hello + git --version + ''; + + # https://devenv.sh/languages/ + languages.nix.enable = true; + + # https://devenv.sh/scripts/ + scripts.hello.exec = "echo hello from $GREET"; + + # https://devenv.sh/pre-commit-hooks/ + # pre-commit.hooks.shellcheck.enable = true; + + # https://devenv.sh/processes/ + # processes.ping.exec = "ping example.com"; +} diff --git a/conveyorlc/devenv.yaml b/conveyorlc/devenv.yaml new file mode 100644 index 0000000..34598b4 --- /dev/null +++ b/conveyorlc/devenv.yaml @@ -0,0 +1,3 @@ +inputs: + nixpkgs: + url: github:NixOS/nixpkgs/master diff --git a/conveyorlc/shell.nix b/conveyorlc/shell.nix new file mode 100644 index 0000000..71e9dc3 --- /dev/null +++ b/conveyorlc/shell.nix @@ -0,0 +1,9 @@ +{ pkgs ? import {} }: +pkgs.mkShell { + buildInputs = [ + pkgs.openmpi + pkgs.boost172 + pkgs.openbabel + pkgs.python3 + ]; +} diff --git a/conveyorlc/uptodate.yaml b/conveyorlc/uptodate.yaml new file mode 100644 index 0000000..34e8dec --- /dev/null +++ b/conveyorlc/uptodate.yaml @@ -0,0 +1,7 @@ +dockerbuild: + + build_args: + clang_version: + key: clang + versions: + - "14" From 085663e312d38fa834c650b8dbfab8febd2939f6 Mon Sep 17 00:00:00 2001 From: vsoch Date: Mon, 21 Nov 2022 15:29:24 -0700 Subject: [PATCH 2/4] ensure boost version in docker tag Signed-off-by: vsoch --- conveyorlc/uptodate.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/conveyorlc/uptodate.yaml b/conveyorlc/uptodate.yaml index 34e8dec..f9bbec9 100644 --- a/conveyorlc/uptodate.yaml +++ b/conveyorlc/uptodate.yaml @@ -1,7 +1,7 @@ dockerbuild: build_args: - clang_version: - key: clang + boost_version: + key: boost versions: - - "14" + - "172" From 2e96b355e980f78e3043775b133921c72b851e0b Mon Sep 17 00:00:00 2001 From: vsoch Date: Mon, 21 Nov 2022 15:32:35 -0700 Subject: [PATCH 3/4] invalid json Signed-off-by: vsoch --- conveyorlc/devbox.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conveyorlc/devbox.json b/conveyorlc/devbox.json index cdf2c3b..c6c2b16 100644 --- a/conveyorlc/devbox.json +++ b/conveyorlc/devbox.json @@ -3,7 +3,7 @@ "boost172", "openbabel", "python3", - "openmpi", + "openmpi" ], "shell": { "init_hook": null From 11806c24d5e40b2b1e83d7b507df6810a223069b Mon Sep 17 00:00:00 2001 From: vsoch Date: Mon, 21 Nov 2022 16:13:36 -0700 Subject: [PATCH 4/4] add hdf5 Signed-off-by: vsoch --- conveyorlc/devbox.json | 4 +++- conveyorlc/devenv.nix | 2 +- conveyorlc/shell.nix | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/conveyorlc/devbox.json b/conveyorlc/devbox.json index c6c2b16..f2f2196 100644 --- a/conveyorlc/devbox.json +++ b/conveyorlc/devbox.json @@ -3,7 +3,9 @@ "boost172", "openbabel", "python3", - "openmpi" + "openmpi", + "hdf5", + "hdf5-mpi" ], "shell": { "init_hook": null diff --git a/conveyorlc/devenv.nix b/conveyorlc/devenv.nix index 7b99efa..82d35ba 100644 --- a/conveyorlc/devenv.nix +++ b/conveyorlc/devenv.nix @@ -5,7 +5,7 @@ env.GREET = "devenv"; # https://devenv.sh/packages/ - packages = [ pkgs.openmpi pkgs.boost172 pkgs.openbabel pkgs.python3 ]; + packages = [ pkgs.openmpi pkgs.boost172 pkgs.openbabel pkgs.python3, pkgs.hdf5, pkgs.hdf5-mpi ]; enterShell = '' hello diff --git a/conveyorlc/shell.nix b/conveyorlc/shell.nix index 71e9dc3..043f5dd 100644 --- a/conveyorlc/shell.nix +++ b/conveyorlc/shell.nix @@ -5,5 +5,7 @@ pkgs.mkShell { pkgs.boost172 pkgs.openbabel pkgs.python3 + pkgs.hdf5 + pkgs.hdf5-mpi ]; }