Skip to content
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.

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

build conveyorlc with older mpi #16

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ jobs:
--allowed-uris https://static.rust-lang.org \
--option restrict-eval true \
--option allow-import-from-derivation true \
--drv-path --show-trace \
--drv-path --show-trace --impure \
-I nixpkgs=$(nix-instantiate --find-file nixpkgs) \
-I $PWD
- name: Build nix packages
env:
NIXPKGS_ALLOW_UNFREE: 1
NIXPKGS_ALLOW_INSECURE: 1
run: nix shell -f '<nixpkgs>' nix-build-uncached -c nix-build-uncached ci.nix -A cacheOutputs
run: nix shell --impure -f '<nixpkgs>' nix-build-uncached -c nix-build-uncached ci.nix -A cacheOutputs
- name: Trigger NUR update
# Don't replace <YOUR_REPO_NAME> here!
if: ${{ matrix.nurRepo != '<YOUR_REPO_NAME>' }}
Expand Down
9 changes: 7 additions & 2 deletions pkgs/hpc/conveyorlc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,17 @@
let
onOffBool = b: if b then "ON" else "OFF";
boost = pkgs.boost172.override { useMpi = true; };
oldpkgs = import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/d1c3fea7ecbed758168787fe4e4a3157e52bc808.tar.gz";
}) {};

openmpi = oldpkgs.openmpi;
in


stdenv.mkDerivation rec {
pname = "conveyorlc";
version = "1.1.2-1";
version = "1.1.2-2";

# Updated when we have final versioned release - still a WIP
# src = fetchurl {
Expand All @@ -35,7 +40,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [cmake pkgs.extra-cmake-modules];
buildInputs = [
boost
pkgs.openmpi
openmpi
pkgs.openbabel2
pkgs.zlib
pkgs.hdf5-cpp
Expand Down