Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7a0672de1885
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 701a6aaeec7c
Choose a head ref
  • 4 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 29, 2020

  1. precice: fix build

    cmake gets confused with python 3.8's version number, switch back to 3.7
    for now until upstream's resolved that
    risicle committed Sep 29, 2020
    Copy the full SHA
    5afdaa2 View commit details
  2. precice: 2.0.2 -> 2.1.0

    risicle committed Sep 29, 2020

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    c943e6b View commit details
  3. precice: enable for darwin

    risicle committed Sep 29, 2020
    Copy the full SHA
    509208e View commit details

Commits on Sep 30, 2020

  1. Merge pull request #99118 from risicle/ris-precice-2.1.0

    precice: fix build, 2.0.2 -> 2.1.0, enable for darwin
    risicle authored Sep 30, 2020
    Copy the full SHA
    701a6aa View commit details
Showing with 8 additions and 7 deletions.
  1. +7 −6 pkgs/development/libraries/precice/default.nix
  2. +1 −1 pkgs/top-level/all-packages.nix
13 changes: 7 additions & 6 deletions pkgs/development/libraries/precice/default.nix
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, python3Packages, petsc }:
{ lib, stdenv, fetchFromGitHub, cmake, gcc, boost, eigen, libxml2, openmpi, python3, petsc }:

stdenv.mkDerivation rec {
pname = "precice";
version = "2.0.2";
# Todo next release switch back to versioning but for python3 support master is needed
version = "2.1.0";

src = fetchFromGitHub {
owner = "precice";
repo = pname;
rev = "v${version}";
sha256 = "1s41wv2077d2gqj0wsxls6wkgdk9cgzcbmk2q43ha08ccq5i3dav";
sha256 = "1268dz39sx3gygnm7vpg59k1wdhy6rhf72i8i0kz4jckll0s9102";
};

cmakeFlags = [
@@ -19,15 +18,17 @@ stdenv.mkDerivation rec {
"-DPYTHON_INCLUDE_DIR=${python3}/include/${python3.libPrefix}m"
];

NIX_CFLAGS_COMPILE = lib.optional stdenv.isDarwin [ "-D_GNU_SOURCE" ];

nativeBuildInputs = [ cmake gcc ];
buildInputs = [ boost eigen libxml2 openmpi python3 python3Packages.numpy ];
buildInputs = [ boost eigen libxml2 openmpi python3 python3.pkgs.numpy ];
enableParallelBuilding = true;

meta = {
description = "preCICE stands for Precise Code Interaction Coupling Environment";
license = with lib.licenses; [ gpl3 ];
homepage = "https://www.precice.org/";
platforms = lib.platforms.linux;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ Scriptkiddi ];
};
}
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
@@ -2351,7 +2351,7 @@ in

psstop = callPackage ../tools/system/psstop { };

precice = callPackage ../development/libraries/precice { };
precice = callPackage ../development/libraries/precice { python3 = python37; };

pueue = callPackage ../applications/misc/pueue { };