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

csxcad: init at 0.6.2 #84644

Merged
merged 1 commit into from Aug 6, 2020
Merged

csxcad: init at 0.6.2 #84644

merged 1 commit into from Aug 6, 2020

Conversation

@matthuszagh
Copy link
Contributor

matthuszagh commented Apr 7, 2020

Motivation for this change

Please see PR 69262 for details. We've decided to break up that PR into smaller pieces to make it easier to review. CSXCAD implements the geometry capabilities of OpenEMS.

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.
@matthuszagh matthuszagh mentioned this pull request Apr 7, 2020
2 of 10 tasks complete
@matthuszagh
Copy link
Contributor Author

matthuszagh commented Apr 7, 2020

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {

# note: optional component libCGAL_ImageIO would need zlib and opengl;
# there are also libCGAL_Qt{3,4} omitted ATM
buildInputs = [ boost gmp mpfr ];
propagatedBuildInputs = [ boost gmp mpfr ];

This comment has been minimized.

@jonringer

jonringer Apr 7, 2020 Contributor

we should not be propagating build inputs, unless they are required by a .pc

Suggested change
propagatedBuildInputs = [ boost gmp mpfr ];
buildInputs = [ boost gmp mpfr ];

This comment has been minimized.

@matthuszagh

matthuszagh Apr 7, 2020 Author Contributor

what's .pc?

This comment has been minimized.

@jonringer

jonringer Apr 7, 2020 Contributor

an output of pkg-config it lists what libraries need to be used by the package or propagated to transitive packages


meta = with stdenv.lib; {
description = "A C++ library to describe geometrical objects";
homepage = https://github.com/thliebig/CSXCAD;

This comment has been minimized.

@jonringer

jonringer Apr 7, 2020 Contributor

rfc 45

Suggested change
homepage = https://github.com/thliebig/CSXCAD;
homepage = "https://github.com/thliebig/CSXCAD";

stdenv.mkDerivation rec {
name = "csxcad-${version}";
version = "0.6.2";

This comment has been minimized.

@jonringer

jonringer Apr 7, 2020 Contributor

Suggested change
version = "0.6.2";
version = "0.6.2";
{ fetchFromGitHub, stdenv, cmake
, fparser, tinyxml, hdf5, cgal_5, vtk
}:
Comment on lines 1 to 12

This comment has been minimized.

@jonringer

jonringer Apr 7, 2020 Contributor

This is the style which the community seems to be going toward

Suggested change
{ fetchFromGitHub, stdenv, cmake
, fparser, tinyxml, hdf5, cgal_5, vtk
}:
{ stdenv
, fetchFromGitHub
, cmake
, fparser
, tinyxml
, hdf5
, cgal_5
, vtk
}:

makes diffs a lot easier to read

@@ -0,0 +1,36 @@
{ fetchFromGitHub, stdenv, cmake
, fparser, tinyxml, hdf5, cgal_5, vtk

This comment has been minimized.

@jonringer

jonringer Apr 7, 2020 Contributor

fparser doesn't seem to exist:

anonymous function at /var/lib/ofborg/checkout/repo/38dca4e3aa6bca43ea96d2fcc04e8229/mr-est/packet-spot-eval-1/pkgs/applications/science/electronics/csxcad/default.nix:1:1 called without required argument 'fparser'

This comment has been minimized.

@matthuszagh

matthuszagh Apr 7, 2020 Author Contributor

My mistake. fparser PR here.

This comment has been minimized.

@matthuszagh

matthuszagh Apr 9, 2020 Author Contributor

I've rebased against master, so the fparser error should be fixed.

@matthuszagh
Copy link
Contributor Author

matthuszagh commented Aug 5, 2020

@jonringer gentle ping on this. Thanks!

src = fetchFromGitHub {
owner = "thliebig";
repo = "CSXCAD";
rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518";

This comment has been minimized.

@jonringer

jonringer Aug 5, 2020 Contributor

this doesnt seem to align with the official 0.6.2 release.


stdenv.mkDerivation rec {
pname = "csxcad";
version = "0.6.2";

This comment has been minimized.

@jonringer

jonringer Aug 5, 2020 Contributor

Suggested change
version = "0.6.2";
version = "unstable-2020-02-08";

since the revision points to a commit of that date

This comment has been minimized.

@matthuszagh

matthuszagh Aug 5, 2020 Author Contributor

Yes, you are correct. Thanks for catching that. It is now fixed.

@matthuszagh matthuszagh force-pushed the matthuszagh:csxcad branch from 3e43cc3 to 7a4b863 Aug 5, 2020
@matthuszagh matthuszagh requested a review from jonringer Aug 6, 2020
Copy link
Contributor

jonringer left a comment

LGTM

Result of nixpkgs-review pr 84644 1

1 package built: - csxcad

@jonringer jonringer merged commit e74a6bc into NixOS:master Aug 6, 2020
18 checks passed
18 checks passed
tests tests
Details
tests
Details
Evaluation Performance Report Evaluator Performance Report
Details
csxcad, csxcad.passthru.tests on aarch64-linux Success
Details
csxcad, csxcad.passthru.tests on x86_64-linux Success
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="7a4b863"; rev="7a4b8639e68f89a7c1f03b01590bf4ce40101fd0"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a4b863"; rev="7a4b8639e68f89a7c1f03b01590bf4ce40101fd0"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a4b863"; rev="7a4b8639e68f89a7c1f03b01590bf4ce40101fd0"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a4b863"; rev="7a4b8639e68f89a7c1f03b01590bf4ce40101fd0"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a4b863"; rev="7a4b8639e68f89a7c1f03b01590bf4ce40101fd0"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a4b863"; rev="7a4b8639e68f89a7c1f03b01590bf4ce40101fd0"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="7a4b863"; rev="7a4b8639e68f89a7c1f03b01590bf4ce40101fd0"; } ./pkgs/t
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
@matthuszagh matthuszagh deleted the matthuszagh:csxcad branch Aug 6, 2020
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

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