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

horizon-eda: init at 1.1.1 #86694

Closed
wants to merge 1 commit into from
Closed

horizon-eda: init at 1.1.1 #86694

wants to merge 1 commit into from

Conversation

yrashk
Copy link
Contributor

@yrashk yrashk commented May 4, 2020 •
edited
Loading

Mostly based on #56497 by @Luz

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.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label May 4, 2020
@ofborg ofborg bot requested a review from Luz May 4, 2020 00:14
@ofborg ofborg bot added 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 May 4, 2020
emilazy
emilazy requested changes May 13, 2020
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Needs a rebase, but builds and runs for me afterwards; thanks for working on this!

Please use 2 spaces for indentation rather than the current mix of hard tabs and 2-or-8 space indentation. I've left some more specific comments.

pkgs/applications/science/electronics/horizon-eda/default.nix Outdated
@@ -0,0 +1,50 @@
{ stdenv, fetchFromGitHub, pkgconfig, sqlite, libyamlcpp, libuuid, gnome3, epoxy, librsvg, zeromq, cppzmq, glm, libgit2, curl, boost, python3, opencascade, libzip, podofo, wrapGAppsHook, coreutils }:
Copy link
Member

Choose a reason for hiding this comment

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

Overly long line; should be split into multiple lines and preferably include lib directly rather than through stdenv; I personally prefer one package per line like this:

-{ stdenv, fetchFromGitHub, pkgconfig, sqlite, libyamlcpp, libuuid, gnome3, epoxy, librsvg, zeromq, cppzmq, glm, libgit2, curl, boost, python3, opencascade, libzip, podofo, wrapGAppsHook, coreutils }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, pkgconfig
+, sqlite
+, libyamlcpp
+, libuuid
+, gnome3
+, epoxy
+, librsvg
+, zeromq
+, cppzmq
+, glm
+, libgit2
+, curl
+, boost
+, python3
+, opencascade
+, libzip
+, podofo
+, wrapGAppsHook
+, coreutils
+}:

pkgs/applications/science/electronics/horizon-eda/default.nix Outdated
Comment on lines 5 to 12
version = "1.1.0";

src = fetchFromGitHub {
owner = "horizon-eda";
repo = "horizon";
rev = "v${version}";
sha256 = "1p8msmpxr5m2037yri3ml5h737n6cdgz2g817805z9kgilxdc56a";
};
Copy link
Member

Choose a reason for hiding this comment

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

New upstream release:

-	version = "1.1.0";
+  version = "1.1.1";
 
-	src = fetchFromGitHub {
-		owner = "horizon-eda";
-		repo = "horizon";
-		rev = "v${version}";
-		sha256 = "1p8msmpxr5m2037yri3ml5h737n6cdgz2g817805z9kgilxdc56a";
-	};
+  src = fetchFromGitHub {
+    owner = "horizon-eda";
+    repo = "horizon";
+    rev = "v${version}";
+    hash = "sha256-gfCD//eiW7zmvVSeIVWos34lOTHqef0k96i4lJ1EzSg=";
+  };

pkgs/applications/science/electronics/horizon-eda/default.nix Outdated
zeromq
];

nativeBuildInputs = [ pkgconfig wrapGAppsHook coreutils ];
Copy link
Member

Choose a reason for hiding this comment

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

No need for coreutils here. It's implicitly present for every build, and you don't need to reference things in the build inputs to refer to them directly with a ${coreutils}/... path like in the installPhase; Nix tracks the dependencies automatically.

-	nativeBuildInputs = [ pkgconfig wrapGAppsHook coreutils ];
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];

pkgs/applications/science/electronics/horizon-eda/default.nix Outdated

enableParallelBuilding = true;

meta = with stdenv.lib; {
Copy link
Member

Choose a reason for hiding this comment

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

If depending on lib directly:

-       meta = with stdenv.lib; {
+  meta = with lib; {

@yrashk
Copy link
Contributor Author

yrashk commented May 13, 2020 •
edited
Loading

@emilazy I believe I addressed your feedback in the updated commit.

@yrashk yrashk changed the title horizon-eda: init at 1.1.0 horizon-eda: init at 1.1.1 May 13, 2020
@emilazy emilazy mentioned this pull request May 13, 2020
Merged
10 tasks
emilazy
emilazy requested changes May 13, 2020
View reviewed changes
Copy link
Member

@emilazy emilazy left a comment

Choose a reason for hiding this comment

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

Thanks for addressing these! A couple more formatting nitpicks, but other than that this looks good to go to me.

The build failed on 64-bit ARM due to freeimage's vendored libpng; I tried to fix it but got lost in the weeds. It's already tracked in #77653, so I opened #86694 to mark freeimage as broken on AArch64 for now.

pkgs/applications/science/electronics/horizon-eda/default.nix Outdated
Comment on lines 35 to 52
buildInputs = [
boost
cppzmq
curl
epoxy
glm
gnome3.gtkmm
libgit2
librsvg
libuuid
libyamlcpp
libzip
opencascade
podofo
python3
sqlite
zeromq
];
Copy link
Member

Choose a reason for hiding this comment

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

Incorrect indentation and trailing whitespace at the end of lines:

-        buildInputs = [ 
-          boost
-          cppzmq 
-          curl
-          epoxy
-          glm
-          gnome3.gtkmm
-          libgit2
-          librsvg
-          libuuid 
-          libyamlcpp 
-          libzip
-          opencascade 
-          podofo
-          python3
-          sqlite
-          zeromq 
-        ];
+  buildInputs = [
+    boost
+    cppzmq
+    curl
+    epoxy
+    glm
+    gnome3.gtkmm
+    libgit2
+    librsvg
+    libuuid
+    libyamlcpp
+    libzip
+    opencascade
+    podofo
+    python3
+    sqlite
+    zeromq
+  ];

pkgs/applications/science/electronics/horizon-eda/default.nix Outdated
Comment on lines 58 to 60
installPhase = ''
make install INSTALL=${coreutils}/bin/install DESTDIR=$out PREFIX=
'';
Copy link
Member

Choose a reason for hiding this comment

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

Incorrect indentation:

   installPhase = ''
-                make install INSTALL=${coreutils}/bin/install DESTDIR=$out PREFIX=
+    make install INSTALL=${coreutils}/bin/install DESTDIR=$out PREFIX=
   '';

@yrashk
Copy link
Contributor Author

yrashk commented May 13, 2020

@emilazy addressed your indentation remarks

@emilazy
Copy link
Member

emilazy commented May 13, 2020

Looks good, thanks!

@guserav guserav mentioned this pull request Oct 7, 2020
Merged
10 tasks
guserav added a commit to guserav/nixpkgs that referenced this pull request Oct 9, 2020
@guserav
horizon-eda: init at 1.2.1
6a4c197 
Mostly based on NixOS#86694 by yrashk
@ryantm ryantm added the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 13, 2020
SuperSandro2000
SuperSandro2000 requested changes Nov 27, 2020
View reviewed changes
pkgs/applications/science/electronics/horizon-eda/default.nix
zeromq
];

nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
nativeBuildInputs = [ pkg-config wrapGAppsHook ];

pkgs/applications/science/electronics/horizon-eda/default.nix
{ stdenv
, lib
, fetchFromGitHub
, pkgconfig
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
, pkgconfig
, pkg-config

pkgs/applications/science/electronics/horizon-eda/default.nix
Comment on lines +1 to +2
{ stdenv
, lib
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
{ stdenv
, lib
{ stdenv

pkgs/applications/science/electronics/horizon-eda/default.nix

enableParallelBuilding = true;

meta = with lib; {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
meta = with lib; {
meta = with stdenv.lib; {

@SuperSandro2000
Copy link
Member

Already newer version in nixpkgs.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

@emilazy emilazy emilazy approved these changes

@Luz Luz Awaiting requested review from Luz

Assignees
No one assigned
Labels
2.status: merge conflict This PR has merge conflicts with the target branch 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.
5 participants
@yrashk @emilazy @SuperSandro2000 @carrotIndustries @ryantm