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.

Sign up for GitHub

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

Jump to bottom

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
+63 −1

Conversation

matthuszagh
Copy link
Contributor

@matthuszagh matthuszagh commented Apr 7, 2020 •
edited
Loading

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.

Sorry, something went wrong.

@matthuszagh matthuszagh mentioned this pull request Apr 7, 2020
Closed
10 tasks
@matthuszagh
Copy link
Contributor Author

@jonringer

jonringer
jonringer reviewed Apr 7, 2020
View reviewed changes
pkgs/development/libraries/CGAL/default.nix Outdated
@@ -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 ];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what's .pc?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

pkgs/applications/science/electronics/csxcad/default.nix Outdated

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rfc 45

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

pkgs/applications/science/electronics/csxcad/default.nix Outdated

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
version = "0.6.2";
version = "0.6.2";

pkgs/applications/science/electronics/csxcad/default.nix Outdated
Comment on lines 1 to 12
{ fetchFromGitHub, stdenv, cmake
, fparser, tinyxml, hdf5, cgal_5, vtk
}:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

jonringer
jonringer reviewed Apr 7, 2020
View reviewed changes
pkgs/applications/science/electronics/csxcad/default.nix Outdated
@@ -0,0 +1,36 @@
{ fetchFromGitHub, stdenv, cmake
, fparser, tinyxml, hdf5, cgal_5, vtk
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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'

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My mistake. fparser PR here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@matthuszagh matthuszagh mentioned this pull request Apr 7, 2020
Merged
10 tasks
@ofborg ofborg bot added 8.has: package (new) This PR adds a new package 11.by: package-maintainer This PR was created by the maintainer of the package it changes 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Apr 9, 2020
@matthuszagh
Copy link
Contributor Author

@jonringer gentle ping on this. Thanks!

jonringer
jonringer reviewed Aug 5, 2020
View reviewed changes
pkgs/applications/science/electronics/csxcad/default.nix
src = fetchFromGitHub {
owner = "thliebig";
repo = "CSXCAD";
rev = "ef6e40931dbd80e0959f37c8e9614c437bf7e518";
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this doesnt seem to align with the official 0.6.2 release.

pkgs/applications/science/electronics/csxcad/default.nix Outdated

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

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

since the revision points to a commit of that date

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@matthuszagh
csxcad: init at unstable-2020-02-08

Verified

This commit was signed with the committer’s verified signature.
turboMaCk Marek Fajkus
GPG key ID: 95585219BA6FE2CC
Verified
Learn about vigilant mode
7a4b863
@matthuszagh matthuszagh requested a review from jonringer August 6, 2020 00:39
jonringer
jonringer approved these changes Aug 6, 2020
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Result of nixpkgs-review pr 84644 1

1 package built: - csxcad

@jonringer jonringer merged commit e74a6bc into NixOS:master Aug 6, 2020
@matthuszagh matthuszagh deleted the csxcad branch August 6, 2020 02:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer

Assignees
No one assigned
Labels
8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@matthuszagh @jonringer