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

precice: fix output and cmake #76937

Merged
merged 1 commit into from Jan 27, 2020
Merged

precice: fix output and cmake #76937

merged 1 commit into from Jan 27, 2020

Conversation

@Scriptkiddi
Copy link
Contributor

@Scriptkiddi Scriptkiddi commented Jan 4, 2020

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 6, 2020

this builds on master for me, what does this try to fix? all i can see is editing the cmake file

@Scriptkiddi Scriptkiddi force-pushed the Scriptkiddi:precice_fix branch from b8d029d to 082677f Jan 6, 2020
@Scriptkiddi
Copy link
Contributor Author

@Scriptkiddi Scriptkiddi commented Jan 6, 2020

It was building before but I messed up the correct installation paths for the cmake files, this is fixed now I also added a patch for a pr that i opened upstream(precice/precice#605 ) because other wise the cmake files include paths that are not avaliable in nixos and it will fail when including the lib

pkgs/development/libraries/precice/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/precice/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/precice/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/precice/default.nix Outdated Show resolved Hide resolved
pkgs/development/libraries/precice/default.nix Outdated Show resolved Hide resolved
@Scriptkiddi Scriptkiddi force-pushed the Scriptkiddi:precice_fix branch from 082677f to bc9d1f7 Jan 20, 2020
@Scriptkiddi
Copy link
Contributor Author

@Scriptkiddi Scriptkiddi commented Jan 20, 2020

@jtojnar all done

@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 21, 2020

still got build failures

@Scriptkiddi Scriptkiddi force-pushed the Scriptkiddi:precice_fix branch from bc9d1f7 to 80079a1 Jan 21, 2020
@Scriptkiddi
Copy link
Contributor Author

@Scriptkiddi Scriptkiddi commented Jan 21, 2020

fixed

@jonringer
Copy link
Contributor

@jonringer jonringer commented Jan 21, 2020

@GrahamcOfBorg build precice

Copy link
Contributor

@Lassulus Lassulus left a comment

tested with nix-review

@Lassulus Lassulus merged commit 50f3a9f into NixOS:master Jan 27, 2020
16 checks passed
16 checks passed
precice on x86_64-darwin No attempt
Details
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
precice on aarch64-linux Success
Details
precice on x86_64-linux Success
Details
@fsimonis
Copy link

@fsimonis fsimonis commented Jan 27, 2020

FYI we merged precice/precice#577 and precice/precice#609.
You should not have to patch our CMake files any longer.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
You can’t perform that action at this time.